[Scummvm-cvs-logs] scummvm master -> 0854dbd68c427ba9b02cc18dd073deac35fed860

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0854dbd68c Revert "GRAPHICS: Fix GUI transparency. As pointed by blitter on IRC"


Commit: 0854dbd68c427ba9b02cc18dd073deac35fed860
    https://github.com/scummvm/scummvm/commit/0854dbd68c427ba9b02cc18dd073deac35fed860
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-05T19:23:04+02:00

Commit Message:
Revert "GRAPHICS: Fix GUI transparency. As pointed by blitter on IRC"

This reverts commit 1d3d6c869240ad076631576be081cfadfef34865.

As it was pointed by wjp, this fully ignores the alphamask.

Changed paths:
    graphics/VectorRendererSpec.cpp



diff --git a/graphics/VectorRendererSpec.cpp b/graphics/VectorRendererSpec.cpp
index 48ea7dc..258d935 100644
--- a/graphics/VectorRendererSpec.cpp
+++ b/graphics/VectorRendererSpec.cpp
@@ -603,8 +603,9 @@ applyScreenShading(GUI::ThemeEngine::ShadingStyle shadingStyle) {
 
 	if (shadingStyle == GUI::ThemeEngine::kShadingDim) {
 
+		// TODO: Check how this interacts with kFeatureOverlaySupportsAlpha
 		for (int i = 0; i < pixels; ++i) {
-			*ptr = (((*ptr | _alphaMask) & colorMask) >> 1);
+			*ptr = ((*ptr & colorMask) >> 1) | _alphaMask;
 			++ptr;
 		}