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/object | |
| parent | a3a76bc0fed3efa9d30ac5d0647a5449b7dcc38a (diff) | |
| parent | c963488b5e25b906ff72cbaabdcc76cbfbc77172 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 85f8869a73d..f4066360805 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -527,10 +527,10 @@ static int posemode_exec(bContext *C, wmOperator *op) } if (is_mode_set) { - ED_object_posemode_exit(C, base); + ED_object_posemode_exit(C, ob); } else { - ED_object_posemode_enter(C, base); + ED_object_posemode_enter(C, ob); } return OPERATOR_FINISHED; } |