Also re-apply standard shader data when the shader program changes

diff --git a/source/renderer.cpp b/source/renderer.cpp
index c744ac5a825009f588c305657f7938daf97b7178..c3a6923f17338cb51d4221f02f6aa158e07fa0fe 100644 (file)
--- a/source/renderer.cpp
+++ b/source/renderer.cpp
@@ -330,13 +330,13 @@ void Renderer::apply_state()
                                changed = (changed&~MODERN_MATRIX)|STANDARD_SHDATA;
                        }
 
                                changed = (changed&~MODERN_MATRIX)|STANDARD_SHDATA;
                        }
 

-                       if(state->material && (changed&MATERIAL_SHDATA))
+                       if(state->material && ((changed&MATERIAL_SHDATA) || shprog_changed))

                        {
                                state->material->get_shader_data().apply();
                                changed &= ~MATERIAL_SHDATA;
                        }
 
                        {
                                state->material->get_shader_data().apply();
                                changed &= ~MATERIAL_SHDATA;
                        }
 

-                       if(changed&STANDARD_SHDATA)
+                       if((changed&STANDARD_SHDATA) || shprog_changed)

                        {
                                standard_shdata.apply();
                                changed &= ~STANDARD_SHDATA;
                        {
                                standard_shdata.apply();
                                changed &= ~STANDARD_SHDATA;