Geometry Nodes: rename modifyPointCloud to modifyGeometrySet

Since the initial merge of the geometry nodes project, the modifyPointCloud
function already was already modifying a geometry set. The function wasn't
renamed back then, because then the merge would have touched many
more files.

Ref T83357.
This commit is contained in:
Jacques Lucke 2020-12-10 14:35:02 +01:00
parent 2b9eb5eee5
commit efb741b280
Notes: blender-bot 2023-02-14 11:07:28 +01:00
Referenced by issue #83357, Design to support instancing (GeometrySet) for mesh objects
62 changed files with 76 additions and 68 deletions

View File

@ -244,12 +244,20 @@ typedef struct ModifierTypeInfo {
struct Mesh *(*modifyMesh)(struct ModifierData *md,
const struct ModifierEvalContext *ctx,
struct Mesh *mesh);
struct Hair *(*modifyHair)(struct ModifierData *md,
const struct ModifierEvalContext *ctx,
struct Hair *hair);
void (*modifyPointCloud)(struct ModifierData *md,
const struct ModifierEvalContext *ctx,
struct GeometrySet *geometry_set);
/**
* The modifier has to change the geometry set in-place. The geometry set can contain zero or
* more geometry components. This callback can be used by modifiers that don't work on any
* specific type of geometry (e.g. mesh).
*/
void (*modifyGeometrySet)(struct ModifierData *md,
const struct ModifierEvalContext *ctx,
struct GeometrySet *geometry_set);
struct Volume *(*modifyVolume)(struct ModifierData *md,
const struct ModifierEvalContext *ctx,
struct Volume *volume);

View File

@ -1325,7 +1325,7 @@ bool BKE_object_support_modifier_type_check(const Object *ob, int modifier_type)
return (mti->modifyHair != NULL) || (mti->flags & eModifierTypeFlag_AcceptsVertexCosOnly);
}
if (ob->type == OB_POINTCLOUD) {
return (mti->modifyPointCloud != NULL);
return (mti->modifyGeometrySet != NULL);
}
if (ob->type == OB_VOLUME) {
return (mti->modifyVolume != NULL);

View File

@ -365,8 +365,8 @@ static void pointcloud_evaluate_modifiers(struct Depsgraph *depsgraph,
continue;
}
if (mti->modifyPointCloud) {
mti->modifyPointCloud(md, &mectx, &geometry_set);
if (mti->modifyGeometrySet) {
mti->modifyGeometrySet(md, &mectx, &geometry_set);
}
}
}

View File

@ -295,7 +295,7 @@ ModifierTypeInfo modifierType_Armature = {
/* deformMatricesEM */ deformMatricesEM,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -1018,7 +1018,7 @@ ModifierTypeInfo modifierType_Array = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -447,7 +447,7 @@ ModifierTypeInfo modifierType_Bevel = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,
/* requiredDataMask */ requiredDataMask,

View File

@ -819,7 +819,7 @@ ModifierTypeInfo modifierType_Boolean = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -346,7 +346,7 @@ ModifierTypeInfo modifierType_Build = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -590,7 +590,7 @@ ModifierTypeInfo modifierType_Cast = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -309,7 +309,7 @@ ModifierTypeInfo modifierType_Cloth = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -309,7 +309,7 @@ ModifierTypeInfo modifierType_Collision = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -851,7 +851,7 @@ ModifierTypeInfo modifierType_CorrectiveSmooth = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -235,7 +235,7 @@ ModifierTypeInfo modifierType_Curve = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -494,7 +494,7 @@ ModifierTypeInfo modifierType_DataTransfer = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -299,7 +299,7 @@ ModifierTypeInfo modifierType_Decimate = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -506,7 +506,7 @@ ModifierTypeInfo modifierType_Displace = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -220,7 +220,7 @@ ModifierTypeInfo modifierType_DynamicPaint = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -186,7 +186,7 @@ ModifierTypeInfo modifierType_EdgeSplit = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -1254,7 +1254,7 @@ ModifierTypeInfo modifierType_Explode = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -238,7 +238,7 @@ ModifierTypeInfo modifierType_Fluid = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -573,7 +573,7 @@ ModifierTypeInfo modifierType_Hook = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -888,7 +888,7 @@ ModifierTypeInfo modifierType_LaplacianDeform = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -634,7 +634,7 @@ ModifierTypeInfo modifierType_LaplacianSmooth = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ init_data,

View File

@ -192,7 +192,7 @@ ModifierTypeInfo modifierType_Lattice = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -462,7 +462,7 @@ ModifierTypeInfo modifierType_Mask = {
/* deformMatricesEM */ nullptr,
/* modifyMesh */ modifyMesh,
/* modifyHair */ nullptr,
/* modifyPointCloud */ nullptr,
/* modifyGeometrySet */ nullptr,
/* modifyVolume */ nullptr,
/* initData */ initData,

View File

@ -295,7 +295,7 @@ ModifierTypeInfo modifierType_MeshToVolume = {
/* deformMatricesEM */ nullptr,
/* modifyMesh */ nullptr,
/* modifyHair */ nullptr,
/* modifyPointCloud */ nullptr,
/* modifyGeometrySet */ nullptr,
/* modifyVolume */ modifyVolume,
/* initData */ initData,

View File

@ -388,7 +388,7 @@ ModifierTypeInfo modifierType_MeshCache = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -646,7 +646,7 @@ ModifierTypeInfo modifierType_MeshDeform = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -270,7 +270,7 @@ ModifierTypeInfo modifierType_MeshSequenceCache = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -234,7 +234,7 @@ ModifierTypeInfo modifierType_Mirror = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -519,7 +519,7 @@ ModifierTypeInfo modifierType_Multires = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -934,9 +934,9 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
return new_mesh;
}
static void modifyPointCloud(ModifierData *md,
const ModifierEvalContext *ctx,
GeometrySet *geometry_set)
static void modifyGeometrySet(ModifierData *md,
const ModifierEvalContext *ctx,
GeometrySet *geometry_set)
{
modifyGeometry(md, ctx, *geometry_set);
}
@ -1063,7 +1063,7 @@ ModifierTypeInfo modifierType_Nodes = {
/* deformMatricesEM */ nullptr,
/* modifyMesh */ modifyMesh,
/* modifyHair */ nullptr,
/* modifyPointCloud */ modifyPointCloud,
/* modifyGeometrySet */ modifyGeometrySet,
/* modifyVolume */ nullptr,
/* initData */ initData,

View File

@ -59,7 +59,7 @@ ModifierTypeInfo modifierType_None = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ NULL,

View File

@ -804,7 +804,7 @@ ModifierTypeInfo modifierType_NormalEdit = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -736,7 +736,7 @@ ModifierTypeInfo modifierType_Ocean = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -678,7 +678,7 @@ ModifierTypeInfo modifierType_ParticleInstance = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -331,7 +331,7 @@ ModifierTypeInfo modifierType_ParticleSystem = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -300,7 +300,7 @@ ModifierTypeInfo modifierType_Remesh = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -1259,7 +1259,7 @@ ModifierTypeInfo modifierType_Screw = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -139,7 +139,7 @@ ModifierTypeInfo modifierType_ShapeKey = {
/* deformMatricesEM */ deformMatricesEM,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ NULL,

View File

@ -292,7 +292,7 @@ ModifierTypeInfo modifierType_Shrinkwrap = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -552,7 +552,7 @@ ModifierTypeInfo modifierType_SimpleDeform = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -2043,7 +2043,7 @@ ModifierTypeInfo modifierType_Skin = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -286,7 +286,7 @@ ModifierTypeInfo modifierType_Smooth = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -119,7 +119,7 @@ ModifierTypeInfo modifierType_Softbody = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ NULL,

View File

@ -274,7 +274,7 @@ ModifierTypeInfo modifierType_Solidify = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -507,7 +507,7 @@ ModifierTypeInfo modifierType_Subsurf = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -240,7 +240,7 @@ ModifierTypeInfo modifierType_Surface = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -1546,7 +1546,7 @@ ModifierTypeInfo modifierType_SurfaceDeform = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -177,7 +177,7 @@ ModifierTypeInfo modifierType_Triangulate = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -370,7 +370,7 @@ ModifierTypeInfo modifierType_UVProject = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -341,7 +341,7 @@ ModifierTypeInfo modifierType_UVWarp = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -328,7 +328,7 @@ ModifierTypeInfo modifierType_VolumeDisplace = {
/* deformMatricesEM */ nullptr,
/* modifyMesh */ nullptr,
/* modifyHair */ nullptr,
/* modifyPointCloud */ nullptr,
/* modifyGeometrySet */ nullptr,
/* modifyVolume */ modifyVolume,
/* initData */ initData,

View File

@ -335,7 +335,7 @@ ModifierTypeInfo modifierType_VolumeToMesh = {
/* deformMatricesEM */ nullptr,
/* modifyMesh */ modifyMesh,
/* modifyHair */ nullptr,
/* modifyPointCloud */ nullptr,
/* modifyGeometrySet */ nullptr,
/* modifyVolume */ nullptr,
/* initData */ initData,

View File

@ -538,7 +538,7 @@ ModifierTypeInfo modifierType_Warp = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -491,7 +491,7 @@ ModifierTypeInfo modifierType_Wave = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ NULL,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -763,7 +763,7 @@ ModifierTypeInfo modifierType_WeightedNormal = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -427,7 +427,7 @@ ModifierTypeInfo modifierType_WeightVGEdit = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -513,7 +513,7 @@ ModifierTypeInfo modifierType_WeightVGMix = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -767,7 +767,7 @@ ModifierTypeInfo modifierType_WeightVGProximity = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -2052,7 +2052,7 @@ ModifierTypeInfo modifierType_Weld = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,

View File

@ -195,7 +195,7 @@ ModifierTypeInfo modifierType_Wireframe = {
/* deformMatricesEM */ NULL,
/* modifyMesh */ modifyMesh,
/* modifyHair */ NULL,
/* modifyPointCloud */ NULL,
/* modifyGeometrySet */ NULL,
/* modifyVolume */ NULL,
/* initData */ initData,