kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for crash adding empty object

Browse Source
This commit is contained in:
Campbell Barton 2011-11-29 01:05:26 +00:00
parent 0668ad2d55
commit 00afa59004
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/object/object_add.c
View File

@ -326,7 +326,9 @@ Object *ED_object_add_type(bContext *C, int type, float *loc, float *rot, int en
DAG_id_type_tag(bmain, ID_OB); DAG_id_type_tag(bmain, ID_OB);
DAG_scene_sort(bmain, scene); 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) if(enter_editmode)
ED_object_enter_editmode(C, EM_IGNORE_LAYER); ED_object_enter_editmode(C, EM_IGNORE_LAYER);
@ -1809,7 +1811,9 @@ Base *ED_object_add_duplicate(Main *bmain, Scene *scene, Base *base, int dupflag
set_sca_new_poins_ob(ob); set_sca_new_poins_ob(ob);
DAG_scene_sort(bmain, scene); 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; return basen;
} }