diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-11-05 17:25:08 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-11-05 17:25:08 +0300 |
| commit | b1ac71b3a0700dba614b0cd981d3696772445977 (patch) | |
| tree | 736ac2a69528dcebd46fd786ca488928f9e31c9c /source/blender/editors/mesh/editmesh_add.c | |
| parent | be4ceb5fdfef870302c7ce2778c0e0fff141bc78 (diff) | |
enter editmode when adding objects even if the object is not in an active layer,
useful for python but in rare cases this also happens for users.
Active layer getting out of sync is an old bug but hard find when it happens.
This at least fixes segfaulting on adding objects.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_add.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_add.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index 85c3558c2ef..5905b2021ea 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -1317,9 +1317,8 @@ static void make_prim_ext(bContext *C, int view_align, int enter_editmode, if(obedit==NULL || obedit->type!=OB_MESH) { /* create editmode */ - ED_object_add_type(C, OB_MESH, view_align, FALSE); - ED_object_enter_editmode(C, EM_DO_UNDO); - obedit= CTX_data_edit_object(C); + obedit= ED_object_add_type(C, OB_MESH, view_align, FALSE); + ED_object_enter_editmode(C, EM_DO_UNDO|EM_IGNORE_LAYER); /* rare cases the active layer is messed up */ newob = 1; } else DAG_id_flush_update(&obedit->id, OB_RECALC_DATA); |