[Bf-blender-cvs] [6939523a152] blender2.8: Fix T54203: crash changing engine w/ project-paint

Campbell Barton noreply at git.blender.org
Wed Mar 21 16:52:01 CET 2018


Commit: 6939523a152891153a1eebbad6e730e7a43c6f08
Author: Campbell Barton
Date:   Wed Mar 21 16:49:37 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB6939523a152891153a1eebbad6e730e7a43c6f08

Fix T54203: crash changing engine w/ project-paint

===================================================================

M	source/blender/editors/render/render_update.c

===================================================================

diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c
index 7b2fcc15649..4d006028245 100644
--- a/source/blender/editors/render/render_update.c
+++ b/source/blender/editors/render/render_update.c
@@ -538,9 +538,11 @@ static void scene_changed(Main *bmain, Scene *scene)
 
 	if (has_texture_mode) {
 		for (ob = bmain->object.first; ob; ob = ob->id.next) {
-			BKE_texpaint_slots_refresh_object(scene, ob);
-			BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL);
-			GPU_drawobject_free(ob->derivedFinal);
+			if (ob->type == OB_MESH) {
+				BKE_texpaint_slots_refresh_object(scene, ob);
+				BKE_paint_proj_mesh_data_check(scene, ob, NULL, NULL, NULL, NULL);
+				GPU_drawobject_free(ob->derivedFinal);
+			}
 		}
 	}
 }



More information about the Bf-blender-cvs mailing list