Commit: 18fc4155fd4299d61789aa0d5b9c1c3f7883636b
Author: Germano Cavalcante
Date: Tue Mar 31 20:57:18 2020 -0300
Branches: master
https://developer.blender.org/rB18fc4155fd4299d61789aa0d5b9c1c3f7883636b
Fix customdata interpolation being done multiple times in Weld Modifier
===================================================================
M source/blender/modifiers/intern/MOD_weld.c
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_weld.c
b/source/blender/modifiers/intern/MOD_weld.c
index 11fd411459c..a7d3280b113 100644
--- a/source/blender/modifiers/intern/MOD_weld.c
+++ b/source/blender/modifiers/intern/MOD_weld.c
@@ -1489,6 +1489,8 @@ static void customdata_weld(
return;
}
+ CustomData_interp(source, dest, (const int *)src_indices, NULL, NULL, count,
dest_index);
+
int src_i, dest_i;
int j;
@@ -1544,7 +1546,8 @@ static void customdata_weld(
}
}
else if (CustomData_layer_has_interp(dest, dest_i)) {
- CustomData_interp(source, dest, (const int *)src_indices, NULL, NULL,
count, dest_index);
+ /* Already calculated.
+ * TODO: Optimize by exposing `typeInfo->interp`. */
}
else if (CustomData_layer_has_math(dest, dest_i)) {
const int size = CustomData_sizeof(type);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
