From 3917691297f786df56878d92d391335489104568 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 13 Feb 2010 15:50:46 +0000 Subject: [#21130] Fix segmentation fault when adding Empty object in Blender rev26870 from Sergey Sharybin (nazgul) --- source/blender/editors/object/object_add.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 1ec3a82fc58..8ed9e10a758 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -295,7 +295,8 @@ Object *ED_object_add_type(bContext *C, int type, float *loc, float *rot, int en 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); -- cgit v1.2.3