X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderer.cpp;h=c3a6923f17338cb51d4221f02f6aa158e07fa0fe;hp=c744ac5a825009f588c305657f7938daf97b7178;hb=63317e423282c1d8a7965743b20a9059a8086e67;hpb=eb4f947bcd825230cfa0f1f27046d9c729435d6e diff --git a/source/renderer.cpp b/source/renderer.cpp index c744ac5a..c3a6923f 100644 --- a/source/renderer.cpp +++ b/source/renderer.cpp @@ -330,13 +330,13 @@ void Renderer::apply_state() 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; } - if(changed&STANDARD_SHDATA) + if((changed&STANDARD_SHDATA) || shprog_changed) { standard_shdata.apply(); changed &= ~STANDARD_SHDATA;