Merge lp://qastaging/~mc-return/compiz/compiz.merge-fix1162484-original-cube-top-and-bottom-caps-not-deformed into lp://qastaging/compiz/0.9.9

Unmerged revisions

3648. By MC Return on 2013-04-03

Additional cleanup

3647. By MC Return on 2013-04-02

Moved the mFiles.size () check to CubeaddonScreen::CubeCap::load (...)

Removed redundant mCurrent = mCurrent % mFiles.size (); calculation,
this has already been done:
cap->mCurrent = (cap->mCurrent + change + count) % count;

count and change both need to be != 0 for mCurrent to change

3646. By MC Return on 2013-04-02

cScreen->damageScreen (); once the cap has been changed
(reverted removal)

3645. By MC Return on 2013-04-01

If the user disables "Draw top face"/"Draw bottom face"
we do not want to draw anything

The original, non-deformed caps will only work for the
non-deformed cube, so we can just use it in that case

We need to clear the texture if no texture files are
specified

void CubeaddonScreen::CubeCap::load is just called by
CubeaddonScreen::changeCap, where cap->mFiles.size ()
is already checked, no need to check it again

Fixed indentation

Removed redundant brackets and newlines

3644. By MC Return on 2013-03-31

Cube-addon:
Only call cubeScreen->cubePaintBottom if there is no deformation
Declare and assign variables in one line, if possible
Minor cleanup