Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-02-08 18:31:09 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-02-08 18:34:32 +0300
commitbe2bd5d722bf36e076663a27537860bb1842931e (patch)
tree8f94eee3e7b5c18ada5c90eccd523a8bf0f08388 /source/blender/draw/intern/draw_armature.c
parent92786141159430fa36e59e0229e4bbb84f2f04be (diff)
Fix mixed weight-paint & pose mode
Diffstat (limited to 'source/blender/draw/intern/draw_armature.c')
-rw-r--r--source/blender/draw/intern/draw_armature.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/intern/draw_armature.c b/source/blender/draw/intern/draw_armature.c
index 5daafadada6..c14fe70e0c3 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -1310,7 +1310,7 @@ static void draw_armature_pose(Object *ob, const float const_color[4])
{
const DRWContextState *draw_ctx = DRW_context_state_get();
- if (draw_ctx->object_mode & OB_MODE_POSE) {
+ if ((draw_ctx->object_mode & OB_MODE_POSE) || (ob == draw_ctx->object_pose)) {
arm->flag |= ARM_POSEMODE;
}