[Bf-blender-cvs] [96bae0f8820] blender2.8: Fix T55879: Crash setting render presets

Campbell Barton noreply at git.blender.org
Tue Jul 10 09:03:29 CEST 2018


Commit: 96bae0f882034a1e0496261df2c3254d1ca13083
Author: Campbell Barton
Date:   Tue Jul 10 09:00:26 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB96bae0f882034a1e0496261df2c3254d1ca13083

Fix T55879: Crash setting render presets

Any RNA using 'rna_SceneCamera_update' crashed when set from Python.

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

M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 5b7377eed17..6b312634b50 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1842,8 +1842,9 @@ static void rna_SceneCamera_update(Main *UNUSED(bmain), Scene *UNUSED(scene), Po
 	Scene *scene = (Scene *)ptr->id.data;
 	Object *camera = scene->camera;
 
-	if (camera)
-		DEG_id_tag_update(&camera->id, 0);
+	if (camera && (camera->type == OB_CAMERA)) {
+		DEG_id_tag_update(&camera->id, OB_RECALC_DATA);
+	}
 }
 
 static void rna_SceneSequencer_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *UNUSED(ptr))



More information about the Bf-blender-cvs mailing list