diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-13 10:44:53 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-13 10:45:35 +0300 |
| commit | d8992192e5512380f57433df113f3e3f8b22f7cb (patch) | |
| tree | 0e35aca3d4dd40061dbb971457f3ab0357131830 /source/blender/editors/space_outliner/outliner_tools.c | |
| parent | 2c6d079a903ff16e2ae7e50082ef08c081cd29bf (diff) | |
Object Mode: pass edit-object to outliner drawing
Also add 'OBEDIT_FROM_EVAL_CTX' macro.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_tools.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tools.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 3ee0d011bbb..b97046d1470 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -419,9 +419,9 @@ static void object_delete_cb( } // check also library later - if (scene->obedit == ob) + if (ob == CTX_data_edit_object(C)) { ED_object_editmode_exit(C, EM_FREEDATA | EM_FREEUNDO | EM_WAITCURSOR | EM_DO_UNDO); - + } ED_object_base_free_and_unlink(CTX_data_main(C), scene, ob); /* leave for ED_outliner_id_unref to handle */ #if 0 @@ -980,7 +980,7 @@ static void object_delete_hierarchy_cb( { ViewLayer *view_layer = CTX_data_view_layer(C); Base *base = (Base *)te->directdata; - Object *obedit = scene->obedit; + Object *obedit = CTX_data_edit_object(C); if (!base) { base = BKE_view_layer_base_find(view_layer, (Object *)tselem->id); |