diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-11 10:02:32 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-11 10:02:32 +0300 |
| commit | debe3011f62e5935dc54d7033052d7d4e24ad449 (patch) | |
| tree | 4858e23ac7e2a49441e76e4ce6eddc2f74e766b7 /source/blender/editors/space_outliner | |
| parent | 1b78f05b1ca466695b39d4fd60570790c1ab9e13 (diff) | |
| parent | 32339a56f11ac1392c4b8d8651ff452a2a5511cc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_select.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_select.c b/source/blender/editors/space_outliner/outliner_select.c index 6626eeb19f4..5019e3b1696 100644 --- a/source/blender/editors/space_outliner/outliner_select.c +++ b/source/blender/editors/space_outliner/outliner_select.c @@ -671,9 +671,9 @@ static eOLDrawState tree_element_active_pose( ED_object_editmode_exit(C, EM_FREEDATA | EM_WAITCURSOR | EM_DO_UNDO); if (ob->mode & OB_MODE_POSE) - ED_armature_exit_posemode(C, base); + ED_object_posemode_exit(C, base); else - ED_armature_enter_posemode(C, base); + ED_object_posemode_enter(C, base); } else { if (ob->mode & OB_MODE_POSE) { |