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/armature/pose_edit.c | |
parent | 4913e47aa0107cbe1daf06e8020a60916ea883a3 (diff) | |
parent | ff74357da09d5060d61d247f75dbb01e91ca3bb9 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/armature/pose_edit.c')
-rw-r--r-- | source/blender/editors/armature/pose_edit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/armature/pose_edit.c b/source/blender/editors/armature/pose_edit.c index 83eb1225c4c..3f2cf6f5853 100644 --- a/source/blender/editors/armature/pose_edit.c +++ b/source/blender/editors/armature/pose_edit.c @@ -109,7 +109,7 @@ void ED_armature_enter_posemode(bContext *C, Base *base) } /* XXX: disabled as this would otherwise cause a nasty loop... */ - //ED_object_toggle_modes(C, ob->mode); + //ED_object_mode_toggle(C, ob->mode); } void ED_armature_exit_posemode(bContext *C, Base *base) |