blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Fix T98454: subdivision doesn't propagate int attributes 

Differential Revision: https://developer.blender.org/D15083
This commit is contained in:
Jacques Lucke 2022-05-31 19:23:52 +02:00
parent f2cd7e08fe
commit dc389a6152
Notes: blender-bot 2023-02-14 05:53:38 +01:00 
Referenced by issue #98454, Geometry Nodes: Vertices from Subdivided Curve to Mesh geometry don't inherit Integer Attributes
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/blenkernel/intern/customdata.cc
View File

@ -54,6 +54,8 @@
/* only for customdata_data_transfer_interp_normal_normals */
#include "data_transfer_intern.h"
using blender::IndexRange;
/* number of layers to add when growing a CustomData object */
#define CUSTOMDATA_GROW 5
@ -517,6 +519,22 @@ static void layerCopy_propInt(const void *source, void *dest, int count)
memcpy(dest, source, sizeof(MIntProperty) * count);
}
static void layerInterp_propInt(const void **sources,
const float *weights,
const float *UNUSED(sub_weights),
int count,
void *dest)
{
float result = 0.0f;
for (const int i : IndexRange(count)) {
const float weight = weights[i];
const float src = *static_cast<const int *>(sources[i]);
result += src * weight;
}
const int rounded_result = static_cast<int>(round(result));
*static_cast<int *>(dest) = rounded_result;
}
/** \} */
/* -------------------------------------------------------------------- */
@ -1679,7 +1697,7 @@ static const LayerTypeInfo LAYERTYPEINFO[CD_NUMTYPES] = {
N_("Int"),
layerCopy_propInt,
nullptr,
nullptr,
layerInterp_propInt,
nullptr},
/* 12: CD_PROP_STRING */
{sizeof(MStringProperty),