blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 763 Projects 19 Wiki Activity

Fix customdata interpolation being done multiple times in Weld Modifier

This commit is contained in:
Germano Cavalcante 2020-03-31 20:57:18 -03:00
parent bcd3c3cb57
commit 18fc4155fd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/modifiers/intern/MOD_weld.c
View File

@ -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);