[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42235] trunk/blender/source/blender/ editors/object/object_add.c: fix for crash adding empty object

Campbell Barton ideasman42 at gmail.com
Tue Nov 29 02:05:37 CET 2011


Revision: 42235
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42235
Author:   campbellbarton
Date:     2011-11-29 01:05:26 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
fix for crash adding empty object

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_add.c

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2011-11-28 23:50:40 UTC (rev 42234)
+++ trunk/blender/source/blender/editors/object/object_add.c	2011-11-29 01:05:26 UTC (rev 42235)
@@ -326,7 +326,9 @@
 
 	DAG_id_type_tag(bmain, ID_OB);
 	DAG_scene_sort(bmain, scene);
-	ED_render_id_flush_update(bmain, ob->data);
+	if (ob->data) {
+		ED_render_id_flush_update(bmain, ob->data);
+	}
 
 	if(enter_editmode)
 		ED_object_enter_editmode(C, EM_IGNORE_LAYER);
@@ -1809,7 +1811,9 @@
 	set_sca_new_poins_ob(ob);
 
 	DAG_scene_sort(bmain, scene);
-	ED_render_id_flush_update(bmain, ob->data);
+	if (ob->data) {
+		ED_render_id_flush_update(bmain, ob->data);
+	}
 
 	return basen;
 }




More information about the Bf-blender-cvs mailing list