[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26873] trunk/blender/source/blender/ editors/object/object_add.c: [#21130] Fix segmentation fault when adding Empty object in Blender rev26870

Campbell Barton ideasman42 at gmail.com
Sat Feb 13 16:50:46 CET 2010


Revision: 26873
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26873
Author:   campbellbarton
Date:     2010-02-13 16:50:46 +0100 (Sat, 13 Feb 2010)

Log Message:
-----------
[#21130] Fix segmentation fault when adding Empty object in Blender rev26870
from Sergey Sharybin (nazgul)

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26870

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	2010-02-13 14:18:54 UTC (rev 26872)
+++ trunk/blender/source/blender/editors/object/object_add.c	2010-02-13 15:50:46 UTC (rev 26873)
@@ -295,7 +295,8 @@
 	ED_object_base_init_transform(C, BASACT, loc, rot);
 
 	DAG_scene_sort(scene);
-	ED_render_id_flush_update(G.main, ob->data);
+	if(ob->data) /* could be an empty */
+		ED_render_id_flush_update(G.main, ob->data);
 
 	if(enter_editmode)
 		ED_object_enter_editmode(C, EM_IGNORE_LAYER);





More information about the Bf-blender-cvs mailing list