[Bf-blender-cvs] [820047a] mesh-transfer-data: Moar cleanup.

Bastien Montagne noreply at git.blender.org
Sat Nov 8 17:04:45 CET 2014


Commit: 820047a67f5d38902f5b3e8bab2174a529af00eb
Author: Bastien Montagne
Date:   Sat Nov 8 14:48:16 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rB820047a67f5d38902f5b3e8bab2174a529af00eb

Moar cleanup.

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

M	source/blender/blenkernel/intern/customdata.c

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

diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index cfc1285..ce81dee 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -299,46 +299,6 @@ static void layerInterp_mdeformvert(void **sources, const float *weights,
 	}
 }
 
-#if 0
-static void layerInterp_mdeformvert_single(void **sources, const float *weights, const float *UNUSED(sub_weights),
-                                           int count, void *dest, int def_nr_src, int def_nr_dst)
-{
-	MDeformVert *dvert_dst = dest;
-	MDeformWeight *dw_dst = NULL;
-	float dw_weight = 0.0f;
-
-	if (count <= 0) {
-		return;
-	}
-
-	for (i = 0; i < dvert_dst->totweight; i++) {
-		if (dvert_dst->dw[i].def_nr == def_nr_dst) {
-			dw_dst = &dvert_dst->dw[i];
-		}
-	}
-
-	if (!dw_dst) {
-		return;
-	}
-
-	for (i = 0; i < count; ++i) {
-		MDeformVert *dvert_src = sources[i];
-		const float interp_weight = weights ? weights[i] : 1.0f;
-
-		for (j = 0; j < source->totweight; ++j) {
-			MDeformWeight *dw_src = &dvert_src->dw[j];
-
-			if (dw_src->def_nr == def_nr_src) {
-				dw_weight += dw_src->weight * interp_weight;
-			}
-		}
-	}
-
-	/* delay writing to the destination incase dest is in sources */
-	dw_dst->weight = dw_weight;
-}
-#endif
-
 static void layerCopy_tface(const void *source, void *dest, int count)
 {
 	const MTFace *source_tf = (const MTFace *)source;




More information about the Bf-blender-cvs mailing list