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:
authorDalai Felinto <dfelinto@gmail.com>2017-05-03 17:34:28 +0300
committerDalai Felinto <dfelinto@gmail.com>2017-05-03 19:06:47 +0300
commit673e6fc535793ddb4858231d19ebc35c6a7b4d7c (patch)
treec6a0deb3bbdaa8a937c9fd2dfc932cd8f729efa9 /source/blender/draw/modes/object_mode.c
parent3bf31c6d234537e2207fc71b1ef016f800803ca9 (diff)
Draw Manager: Bring pose bones to the pose engine
Note: We should test if the armature is the "armature modifier" parent of the object. If any good samaritan feels like tackling this, the function to change is: DRW_pose_mode_armature
Diffstat (limited to 'source/blender/draw/modes/object_mode.c')
-rw-r--r--source/blender/draw/modes/object_mode.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 4b4c2f0abb6..4a77a9f4c6a 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -1249,15 +1249,10 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
{
bArmature *arm = ob->data;
if (arm->edbo == NULL) {
- if ((ob->mode & OB_MODE_POSE) && (ob == OBACT_NEW)) {
- DRW_shgroup_armature_pose(
- ob, psl->bone_solid, psl->bone_wire,
- stl->g_data->relationship_lines);
- }
- else {
+ if (DRW_state_is_select() || !DRW_pose_mode_armature(ob, OBACT_NEW)) {
DRW_shgroup_armature_object(
- ob, sl, psl->bone_solid, psl->bone_wire,
- stl->g_data->relationship_lines);
+ ob, sl, psl->bone_solid, psl->bone_wire,
+ stl->g_data->relationship_lines);
}
}
break;