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:
authorBastien Montagne <montagne29@wanadoo.fr>2018-07-19 17:52:49 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-07-20 11:22:06 +0300
commit2de283615f081fa76fb05ac0bf81f831651f9e51 (patch)
tree2802d27f3bc0ce55b9a5b56722a5efa3ada3c29b /source/blender
parentc205de020365eddbbc0f0cde0ad02dda91126807 (diff)
Make `draw_armature()` abort in case pose is not up-to-date.
Previously it was calling `BKE_pose_rebuild()`, such thing shall never be called from drawing code! Hopefully this now works as expected and that horrible hack is not needed anymore.
Diffstat (limited to 'source/blender')
-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 8b90d328541..f0a32dfc8e0 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -1623,7 +1623,7 @@ static void draw_armature_pose(Object *ob, const float const_color[4])
/* We can't safely draw non-updated pose, might contain NULL bone pointers... */
if (ob->pose->flag & POSE_RECALC) {
- BKE_pose_rebuild(NULL, ob, arm);
+ return;
}
// if (!(base->flag & OB_FROMDUPLI)) // TODO