Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2020-07-15 19:14:03 +0300
committerJacques Lucke <jacques@blender.org>2020-07-15 19:14:03 +0300
commitcda6da4957186710d7390d16aa8559333642c383 (patch)
tree12fba5c86eae6e8e1024ae71bbddd8f0f656b230 /source/blender/blenkernel
parentae4098e234a0fd80c3a67d35bffa04708875f2e2 (diff)
Fix error in recent commit
Obviously a copy paste error of mine...
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/customdata.c4
1 files changed, 3 insertions, 1 deletions
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 = {