diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-03 10:01:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-03 10:07:50 +0300 |
| commit | 599f6c791af723894c995850e4590ecf6a23f6ab (patch) | |
| tree | 77e005ff6ffe4bfebb1532ff9863888f41819212 /source/blender/editors/object/object_modes.c | |
| parent | 2df86ca9672759c8a99fa72e5e6d3d3e0c2da5c7 (diff) | |
| parent | be2e549111b8dd47a9e468fe34dd1396f99b1cb1 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object/object_modes.c')
| -rw-r--r-- | source/blender/editors/object/object_modes.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_modes.c b/source/blender/editors/object/object_modes.c index 10c7fcfeba1..4c625a4d33c 100644 --- a/source/blender/editors/object/object_modes.c +++ b/source/blender/editors/object/object_modes.c @@ -215,7 +215,8 @@ void ED_object_mode_exit(bContext *C) bool ED_object_mode_generic_enter( struct bContext *C, eObjectMode object_mode) { - Object *ob = CTX_data_active_object(C); + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *ob = OBACT(view_layer); if (ob == NULL) { return (object_mode == OB_MODE_OBJECT); } |