← Back to branch summary

~mc-return/compiz/compiz.merge-resizeinfo-minor-improvements

« back to all changes in this revision

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

Screenshot Plugin: Re-added GL_BLEND enabling and disabling calls to fix the selection rectangle not being transparent anymore.
Make sure to use GL_BLEND for the non-GLES codepath only.
Those calls got lost in r3320 (GLES merge).

(LP: #1047788). Fixes: https://bugs.launchpad.net/bugs/1047788. Approved by Timo Jyrinki.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/screenshot/src/screenshot.cpp
295
295
                          -output->region ()->extents.y2,
296
296
                          0.0f);
297
297
 
 
298
#ifndef USE_GLES
 
299
            glEnable (GL_BLEND);
 
300
#endif
298
301
            streamingBuffer->begin (GL_TRIANGLE_STRIP);
299
302
 
300
303
            streamingBuffer->addColors (1, colorData);
315
318
            streamingBuffer->addVertices (4, vertexData);
316
319
 
317
320
            streamingBuffer->end ();
 
321
#ifndef USE_GLES
 
322
            glDisable (GL_BLEND);
 
323
#endif
318
324
            streamingBuffer->render (transform);
319
325
        }
320
326
    }