[Bf-blender-cvs] [2de283615f0] blender2.8: Make `draw_armature()` abort in case pose is not up-to-date.

Bastien Montagne noreply at git.blender.org
Fri Jul 20 10:45:00 CEST 2018


Commit: 2de283615f081fa76fb05ac0bf81f831651f9e51
Author: Bastien Montagne
Date:   Thu Jul 19 16:52:49 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB2de283615f081fa76fb05ac0bf81f831651f9e51

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.

===================================================================

M	source/blender/draw/intern/draw_armature.c

===================================================================

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



More information about the Bf-blender-cvs mailing list