~mc-return/compiz/compiz.merge-src-header-files-cleanup

« back to all changes in this revision

Viewing changes to plugins/cube/src/cube.cpp

  • Committer: MC Return
  • Date: 2013-06-20 05:56:13 UTC
  • mfrom: (3724.2.16 0.9.10)
  • Revision ID: mc.return@gmx.net-20130620055613-8dp00nmw2jpm3ptu
Merged latest lp:compiz and fixed conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
33
33
#include <privates.h>
34
34
 
35
35
class CubePluginVTable :
36
 
    public CompPlugin::VTableForScreenAndWindow<CubeScreen, PrivateCubeWindow>
 
36
    public CompPlugin::VTableForScreenAndWindow<CubeScreen, PrivateCubeWindow, COMPIZ_CUBE_ABI>
37
37
{
38
38
    public:
39
39
 
1307
1307
    int cullNorm;
1308
1308
    glGetIntegerv (GL_CULL_FACE_MODE, &cullNorm);
1309
1309
 
1310
 
    bool cullInv   = (cullNorm == GL_BACK)? GL_FRONT : GL_BACK;
 
1310
    int  cullInv   = (cullNorm == GL_BACK)? GL_FRONT : GL_BACK;
1311
1311
    bool wasCulled = glIsEnabled (GL_CULL_FACE);
1312
1312
 
1313
1313
    if (!mFullscreenOutput)