diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-02-13 18:50:46 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-02-13 18:50:46 +0300 |
| commit | 3917691297f786df56878d92d391335489104568 (patch) | |
| tree | 33188a9646ea1ba5ec019f713d6201682ccc0211 /source/blender/editors | |
| parent | 0988f651462a965d0927755394b73f07874f77af (diff) | |
[#21130] Fix segmentation fault when adding Empty object in Blender rev26870
from Sergey Sharybin (nazgul)
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |