blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

GPUMaterial: Avoid freeing GLSL shaders when changing scene properties. 

This was causing major slowdown when changing Colormanagment settings or post processing.
This commit is contained in:
Clément Foucault 2017-06-23 16:41:44 +02:00
parent 45720922f7
commit 986a3d15ac
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/render/render_update.c
View File

@ -519,8 +519,10 @@ static void scene_changed(Main *bmain, Scene *scene)
/* glsl */
for (ob = bmain->object.first; ob; ob = ob->id.next) {
#if 0 /* This was needed by old glsl where all lighting was statically linked into the shader. */
if (ob->gpulamp.first)
GPU_lamp_free(ob);
#endif
if (ob->mode & OB_MODE_TEXTURE_PAINT) {
BKE_texpaint_slots_refresh_object(scene, ob);
@ -529,6 +531,7 @@ static void scene_changed(Main *bmain, Scene *scene)
}
}
#if 0 /* This was needed by old glsl where all lighting was statically linked into the shader. */
for (ma = bmain->mat.first; ma; ma = ma->id.next)
if (ma->gpumaterial.first)
GPU_material_free(&ma->gpumaterial);
@ -539,6 +542,7 @@ static void scene_changed(Main *bmain, Scene *scene)
if (defmaterial.gpumaterial.first)
GPU_material_free(&defmaterial.gpumaterial);
#endif
}
void ED_render_id_flush_update(Main *bmain, ID *id)