diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-03-02 06:46:21 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-03-02 06:46:21 +0300 |
commit | da2d0fe43af030b5fe6e11226e7e691242f001aa (patch) | |
tree | 2f701d643bad9a51616a1a47d96a3d36acc43c26 /source/blender/editors/util | |
parent | 4913e47aa0107cbe1daf06e8020a60916ea883a3 (diff) | |
parent | ff74357da09d5060d61d247f75dbb01e91ca3bb9 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/util')
-rw-r--r-- | source/blender/editors/util/ed_util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index 562ba2c42b3..7a5b8bfbda1 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -118,7 +118,7 @@ void ED_editors_init(bContext *C) if (!ELEM(object_mode, OB_MODE_OBJECT, OB_MODE_POSE)) { if (!ID_IS_LINKED(obact) && !(data && ID_IS_LINKED(data))) { CTX_wm_window_set(C, win); - ED_object_toggle_modes(C, object_mode); + ED_object_mode_toggle(C, object_mode); CTX_wm_window_set(C, NULL); } } |