diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-11 10:41:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-11 10:41:49 +0300 |
| commit | ce3adc090d6cb380e345b0112079b01a61aa3544 (patch) | |
| tree | 807962bc12d15111c976a655de9c2b64aec0c7b3 /source/blender/editors/space_outliner/outliner_select.c | |
| parent | a3a76bc0fed3efa9d30ac5d0647a5449b7dcc38a (diff) | |
| parent | c963488b5e25b906ff72cbaabdcc76cbfbc77172 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_select.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 5019e3b1696..2f44420f3b7 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -667,13 +667,16 @@ static eOLDrawState tree_element_active_pose( } if (set != OL_SETSEL_NONE) { - if (OBEDIT_FROM_VIEW_LAYER(view_layer)) + if (OBEDIT_FROM_VIEW_LAYER(view_layer)) { ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO); + } - if (ob->mode & OB_MODE_POSE) - ED_object_posemode_exit(C, base); - else - ED_object_posemode_enter(C, base); + if (ob->mode & OB_MODE_POSE) { + ED_object_posemode_exit(C, ob); + } + else { + ED_object_posemode_enter(C, ob); + } } else { if (ob->mode & OB_MODE_POSE) { |