[Bf-blender-cvs] [c7c5bf8a350] greasepencil-object: Fix again DwM bbones drawing.

Bastien Montagne noreply at git.blender.org
Mon May 15 10:42:53 CEST 2017


Commit: c7c5bf8a3501e96c1ac639f05aa2bbf4910fa77f
Author: Bastien Montagne
Date:   Fri May 12 11:52:33 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBc7c5bf8a3501e96c1ac639f05aa2bbf4910fa77f

Fix again DwM bbones drawing.

Stupid mistake in rB6824ee0595c9dd7d1c18864f2 fix, again reported by
@campbellbarton, thanks.

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

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 68104dafc07..720740ef84b 100644
--- a/source/blender/draw/intern/draw_armature.c
+++ b/source/blender/draw/intern/draw_armature.c
@@ -753,7 +753,6 @@ static void draw_bone_update_disp_matrix_bbone(EditBone *eBone, bPoseChannel *pc
 	float s[4][4], ebmat[4][4];
 	float length, xwidth, zwidth;
 	float (*bone_mat)[4];
-	float (*disp_mat)[4];
 	short bbone_segments;
 
 	/* TODO : This should be moved to depsgraph or armature refresh
@@ -764,7 +763,6 @@ static void draw_bone_update_disp_matrix_bbone(EditBone *eBone, bPoseChannel *pc
 		xwidth = pchan->bone->xwidth;
 		zwidth = pchan->bone->zwidth;
 		bone_mat = pchan->pose_mat;
-		disp_mat = pchan->disp_mat;
 		bbone_segments = pchan->bone->segments;
 	}
 	else {
@@ -775,7 +773,6 @@ static void draw_bone_update_disp_matrix_bbone(EditBone *eBone, bPoseChannel *pc
 		xwidth = eBone->xwidth;
 		zwidth = eBone->zwidth;
 		bone_mat = ebmat;
-		disp_mat = eBone->disp_mat;
 		bbone_segments = eBone->segments;
 	}
 
@@ -791,7 +788,7 @@ static void draw_bone_update_disp_matrix_bbone(EditBone *eBone, bPoseChannel *pc
 
 			for (int i = bbone_segments; i--; bbones_mat++) {
 				mul_m4_m4m4(bbones_mat->mat, bbones_mat->mat, s);
-				mul_m4_m4m4(bbones_mat->mat, disp_mat, bbones_mat->mat);
+				mul_m4_m4m4(bbones_mat->mat, bone_mat, bbones_mat->mat);
 			}
 		}
 		else {
@@ -806,7 +803,7 @@ static void draw_bone_update_disp_matrix_bbone(EditBone *eBone, bPoseChannel *pc
 
 			for (int i = bbone_segments; i--; bbones_mat++) {
 				mul_m4_m4m4(*bbones_mat, *bbones_mat, s);
-				mul_m4_m4m4(*bbones_mat, disp_mat, *bbones_mat);
+				mul_m4_m4m4(*bbones_mat, bone_mat, *bbones_mat);
 			}
 		}
 		else {




More information about the Bf-blender-cvs mailing list