diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-09-21 01:43:42 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-09-21 01:43:42 -0300 |
| commit | 11a5ed508b1cbde61a4d9dd4f469e86e74667623 (patch) | |
| tree | e4bc1926057d788aeeef3633930bb958eb976d3a /drivers | |
| parent | c5b905fca82f1437486f2168270c5caa0b4bf104 (diff) | |
Fixed too many little issues, check the issues closed today.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gles2/rasterizer_gles2.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/gles2/rasterizer_gles2.cpp b/drivers/gles2/rasterizer_gles2.cpp index 96f6ca3ece..ecf80047bd 100644 --- a/drivers/gles2/rasterizer_gles2.cpp +++ b/drivers/gles2/rasterizer_gles2.cpp @@ -5748,7 +5748,7 @@ void RasterizerGLES2::_setup_skeleton(const Skeleton *p_skeleton) { void RasterizerGLES2::_render_list_forward(RenderList *p_render_list,const Transform& p_view_transform, const Transform& p_view_transform_inverse,const CameraMatrix& p_projection,bool p_reverse_cull,bool p_fragment_light,bool p_alpha_pass) { if (current_rt && current_rt_vflip) { - p_reverse_cull=!p_reverse_cull; + //p_reverse_cull=!p_reverse_cull; glFrontFace(GL_CCW); } @@ -5881,10 +5881,12 @@ void RasterizerGLES2::_render_list_forward(RenderList *p_render_list,const Trans if (desired_blend) { glEnable(GL_BLEND); - glColorMask(1,1,1,0); + if (!current_rt || !current_rt_transparent) + glColorMask(1,1,1,0); } else { glDisable(GL_BLEND); glColorMask(1,1,1,1); + } prev_blend=desired_blend; @@ -5892,8 +5894,8 @@ void RasterizerGLES2::_render_list_forward(RenderList *p_render_list,const Trans if (desired_blend && desired_blend_mode!=current_blend_mode) { - switch(desired_blend_mode) { + switch(desired_blend_mode) { case VS::MATERIAL_BLEND_MODE_MIX: { glBlendEquation(GL_FUNC_ADD); |