Commit 7531b3e9 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'fix-rbg' into 'master'

Fix RGB/RBG mixup that caused strange artifacts.

See merge request !4
parents 24f3aa0c 182748dd
......@@ -12,5 +12,5 @@ void main()
vec4 cb = texture2D(BackSceneTex, vTexCoord);
// combine front and back color
oColor = vec4(cf.rgb + cb.rbg * (1.0 - cf.a), 1.0);
}
\ No newline at end of file
oColor = vec4(cf.rgb + cb.rgb * (1.0 - cf.a), 1.0);
}
......@@ -12,5 +12,5 @@ void main()
vec4 cb = texture(BackSceneTex, vTexCoord);
// combine front and back color
oColor = vec4(cf.rgb + cb.rbg * (1.0 - cf.a), 1.0);
}
\ No newline at end of file
oColor = vec4(cf.rgb + cb.rgb * (1.0 - cf.a), 1.0);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment