diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-08 18:31:09 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-08 18:34:32 +0300 |
| commit | be2bd5d722bf36e076663a27537860bb1842931e (patch) | |
| tree | 8f94eee3e7b5c18ada5c90eccd523a8bf0f08388 /source/blender/draw/modes | |
| parent | 92786141159430fa36e59e0229e4bbb84f2f04be (diff) | |
Fix mixed weight-paint & pose mode
Diffstat (limited to 'source/blender/draw/modes')
| -rw-r--r-- | source/blender/draw/modes/pose_mode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/modes/pose_mode.c b/source/blender/draw/modes/pose_mode.c index 1589ff39bdf..749c3e71368 100644 --- a/source/blender/draw/modes/pose_mode.c +++ b/source/blender/draw/modes/pose_mode.c @@ -145,7 +145,7 @@ bool DRW_pose_mode_armature(Object *ob, Object *active_ob) /* Armature parent is also handled by pose mode engine. */ if ((active_ob != NULL) && ((draw_ctx->object_mode & OB_MODE_WEIGHT_PAINT) != 0)) { - if (active_ob->parent == ob) { + if (ob == draw_ctx->object_pose) { return true; } } |