[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40840] trunk/blender/source/blender/ makesrna/intern/rna_object.c: fix [#28800] Scene NULL in frame change callback, crashes on property update.

[Campbell Barton]

Revision: 40840
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40840
Author:   campbellbarton
Date:     2011-10-07 00:08:40 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
fix [#28800] Scene NULL in frame change callback, crashes on property update.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_object.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c	2011-10-06 23:16:12 UTC (rev 40839)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c	2011-10-07 00:08:40 UTC (rev 40840)
@@ -250,16 +250,20 @@
 static void rna_Object_dependency_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
 	DAG_id_tag_update(ptr->id.data, OB_RECALC_OB);
-	DAG_scene_sort(bmain, scene);
+	if (scene) {
+		DAG_scene_sort(bmain, scene);
+	}
 	WM_main_add_notifier(NC_OBJECT|ND_PARENT, ptr->id.data);
 }
 
 /* when changing the selection flag the scene needs updating */
 static void rna_Object_select_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *ptr)
 {
-	Object *ob= (Object*)ptr->id.data;
-	short mode = ob->flag & SELECT ? BA_SELECT : BA_DESELECT;
-	ED_base_object_select(object_in_scene(ob, scene), mode);
+	if (scene) {
+		Object *ob= (Object*)ptr->id.data;
+		short mode = ob->flag & SELECT ? BA_SELECT : BA_DESELECT;
+		ED_base_object_select(object_in_scene(ob, scene), mode);
+	}
 }
 
 static void rna_Base_select_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)