Commit: cda6da4957186710d7390d16aa8559333642c383
Author: Jacques Lucke
Date: Wed Jul 15 18:14:03 2020 +0200
Branches: master
https://developer.blender.org/rBcda6da4957186710d7390d16aa8559333642c383
Fix error in recent commit
Obviously a copy paste error of mine...
===================================================================
M source/blender/blenkernel/intern/customdata.c
===================================================================
diff --git a/source/blender/blenkernel/intern/customdata.c
b/source/blender/blenkernel/intern/customdata.c
index 30b6ce1bee1..22d4af6fa39 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1516,7 +1516,7 @@ static bool layerValidate_propfloat3(void *data, const
uint totitems, const bool
static void layerInterp_propfloat2(
const void **sources, const float *weights, const float *sub_weights, int
count, void *dest)
{
- vec2f result = {0.0f, 0.0f, 0.0f};
+ vec2f result = {0.0f, 0.0f};
for (int i = 0; i < count; i++) {
float weight = weights ? weights[i] : 1.0f;
const vec2f *src = sources[i];
@@ -1979,6 +1979,8 @@ static const char *LAYERTYPENAMES[CD_NUMTYPES] = {
"CDHairMapping",
"CDPoint",
"CDPropCol",
+ "CDPropFloat3",
+ "CDPropFloat2",
};
const CustomData_MeshMasks CD_MASK_BAREMESH = {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
