[Bf-blender-cvs] [89e8ccaacfd] greasepencil-object: Cleanup unused function

Antonioya noreply at git.blender.org
Thu Aug 23 10:34:00 CEST 2018


Commit: 89e8ccaacfdc0a7b53d3281af5bc54816e78ea13
Author: Antonioya
Date:   Sun Aug 19 11:41:14 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB89e8ccaacfdc0a7b53d3281af5bc54816e78ea13

Cleanup unused function

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

M	source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c
index 28203ed557b..51e57c87b25 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilarmature.c
@@ -167,53 +167,6 @@ static void pchan_bone_deform(bPoseChannel *pchan, bPoseChanDeform *pdef_info, f
 	(*contrib) += weight;
 }
 
-static float dist_bone_deform(bPoseChannel *pchan, bPoseChanDeform *pdef_info, float vec[3], DualQuat *dq,
-	float mat[3][3], const float co[3])
-{
-	Bone *bone = pchan->bone;
-	float fac, contrib = 0.0;
-	float cop[3], bbonemat[3][3];
-	DualQuat bbonedq;
-
-	if (bone == NULL)
-		return 0.0f;
-
-	copy_v3_v3(cop, co);
-
-	fac = distfactor_to_bone(cop, bone->arm_head, bone->arm_tail, bone->rad_head, bone->rad_tail, bone->dist);
-
-	if (fac > 0.0f) {
-		fac *= bone->weight;
-		contrib = fac;
-		if (contrib > 0.0f) {
-			if (vec) {
-				if (bone->segments > 1)
-					/* applies on cop and bbonemat */
-					b_bone_deform(pdef_info, bone, cop, NULL, (mat) ? bbonemat : NULL);
-				else
-					mul_m4_v3(pchan->chan_mat, cop);
-
-				/* Make this a delta from the base position */
-				sub_v3_v3(cop, co);
-				madd_v3_v3fl(vec, cop, fac);
-
-				if (mat)
-					pchan_deform_mat_add(pchan, fac, bbonemat, mat);
-			}
-			else {
-				if (bone->segments > 1) {
-					b_bone_deform(pdef_info, bone, cop, &bbonedq, NULL);
-					add_weighted_dq_dq(dq, &bbonedq, fac);
-				}
-				else
-					add_weighted_dq_dq(dq, pdef_info->dual_quat, fac);
-			}
-		}
-	}
-
-	return contrib;
-}
-
 static void pchan_b_bone_defmats(bPoseChannel *pchan, bPoseChanDeform *pdef_info)
 {
 	Bone *bone = pchan->bone;



More information about the Bf-blender-cvs mailing list