griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Modifiers: add ModifierTypeInfo::foreach_cache callback

Browse Source 
This allows modifiers to have cache pointers that are preserved over undo steps.
I intend to use this for the baked data cache for the geometry nodes modifier.

Pull Request: https://projects.blender.org/blender/blender/pulls/117307
This commit is contained in:
Jacques Lucke
2024-01-18 22:51:30 +01:00
parent d25274ee63
commit f4e52f447a
63 changed files with 88 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/BKE_modifier.hh
View File

@@ -7,6 +7,7 @@
* \ingroup bke
*/
#include "BLI_compiler_attrs.h"
#include "BLI_function_ref.hh"
#include "BLI_math_matrix_types.hh"
#include "BLI_span.hh"
@@ -33,6 +34,7 @@ struct ModifierData;
struct Object;
struct Scene;
struct StructRNA;
struct IDCacheKey;
enum class ModifierTypeType {
/* Should not be used, only for None modifier type */
@@ -381,6 +383,14 @@ struct ModifierTypeInfo {
* not been written (e.g. runtime data) can be reset.
*/
void (*blend_read)(BlendDataReader *reader, ModifierData *md);
/**
* Iterate over all cache pointers of given modifier. Also see #IDTypeInfo::foreach_cache.
*/
void (*foreach_cache)(
Object *object,
ModifierData *md,
blender::FunctionRef<void(const IDCacheKey &cache_key, void **cache_p, uint flags)> fn);
};
/* Used to set a modifier's panel type. */

18
source/blender/blenkernel/intern/object.cc
View File

@@ -587,6 +587,22 @@ static void object_foreach_path(ID *id, BPathForeachPathData *bpath_data)
}
}
static void object_foreach_cache(ID *id,
IDTypeForeachCacheFunctionCallback function_callback,
void *user_data)
{
Object *ob = reinterpret_cast<Object *>(id);
LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
if (const ModifierTypeInfo *info = BKE_modifier_get_info(ModifierType(md->type))) {
if (info->foreach_cache) {
info->foreach_cache(ob, md, [&](const IDCacheKey &cache_key, void **cache_p, uint flags) {
function_callback(id, &cache_key, cache_p, flags, user_data);
});
}
}
}
}
static void object_blend_write(BlendWriter *writer, ID *id, const void *id_address)
{
Object *ob = (Object *)id;
@@ -1069,7 +1085,7 @@ IDTypeInfo IDType_ID_OB = {
/*free_data*/ object_free_data,
/*make_local*/ nullptr,
/*foreach_id*/ object_foreach_id,
/*foreach_cache*/ nullptr,
/*foreach_cache*/ object_foreach_cache,
/*foreach_path*/ object_foreach_path,
/*owner_pointer_get*/ nullptr,

1
source/blender/modifiers/intern/MOD_armature.cc
View File

@@ -284,4 +284,5 @@ ModifierTypeInfo modifierType_Armature = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_array.cc
View File

@@ -1104,4 +1104,5 @@ ModifierTypeInfo modifierType_Array = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_bevel.cc
View File

@@ -444,4 +444,5 @@ ModifierTypeInfo modifierType_Bevel = {
/*panel_register*/ panel_register,
/*blend_write*/ blend_write,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_boolean.cc
View File

@@ -702,4 +702,5 @@ ModifierTypeInfo modifierType_Boolean = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_build.cc
View File

@@ -329,4 +329,5 @@ ModifierTypeInfo modifierType_Build = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_cast.cc
View File

@@ -541,4 +541,5 @@ ModifierTypeInfo modifierType_Cast = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_cloth.cc
View File

@@ -304,4 +304,5 @@ ModifierTypeInfo modifierType_Cloth = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_collision.cc
View File

@@ -316,4 +316,5 @@ ModifierTypeInfo modifierType_Collision = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_correctivesmooth.cc
View File

@@ -858,4 +858,5 @@ ModifierTypeInfo modifierType_CorrectiveSmooth = {
/*panel_register*/ panel_register,
/*blend_write*/ blend_write,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_curve.cc
View File

@@ -222,4 +222,5 @@ ModifierTypeInfo modifierType_Curve = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_datatransfer.cc
View File

@@ -531,4 +531,5 @@ ModifierTypeInfo modifierType_DataTransfer = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_decimate.cc
View File

@@ -305,4 +305,5 @@ ModifierTypeInfo modifierType_Decimate = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_displace.cc
View File

@@ -474,4 +474,5 @@ ModifierTypeInfo modifierType_Displace = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_dynamicpaint.cc
View File

@@ -223,4 +223,5 @@ ModifierTypeInfo modifierType_DynamicPaint = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_edgesplit.cc
View File

@@ -192,4 +192,5 @@ ModifierTypeInfo modifierType_EdgeSplit = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_explode.cc
View File

@@ -1247,4 +1247,5 @@ ModifierTypeInfo modifierType_Explode = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_fluid.cc
View File

@@ -263,4 +263,5 @@ ModifierTypeInfo modifierType_Fluid = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_grease_pencil_opacity.cc
View File

@@ -330,4 +330,5 @@ ModifierTypeInfo modifierType_GreasePencilOpacity = {
/*panel_register*/ blender::panel_register,
/*blend_write*/ blender::blend_write,
/*blend_read*/ blender::blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_grease_pencil_subdiv.cc
View File

@@ -185,4 +185,5 @@ ModifierTypeInfo modifierType_GreasePencilSubdiv = {
/*panel_register*/ blender::panel_register,
/*blend_write*/ blender::blend_write,
/*blend_read*/ blender::blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_hook.cc
View File

@@ -574,4 +574,5 @@ ModifierTypeInfo modifierType_Hook = {
/*panel_register*/ panel_register,
/*blend_write*/ blend_write,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_laplaciandeform.cc
View File

@@ -884,4 +884,5 @@ ModifierTypeInfo modifierType_LaplacianDeform = {
/*panel_register*/ panel_register,
/*blend_write*/ blend_write,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_laplaciansmooth.cc
View File

@@ -584,4 +584,5 @@ ModifierTypeInfo modifierType_LaplacianSmooth = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_lattice.cc
View File

@@ -195,4 +195,5 @@ ModifierTypeInfo modifierType_Lattice = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_mask.cc
View File

@@ -830,4 +830,5 @@ ModifierTypeInfo modifierType_Mask = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_mesh_to_volume.cc
View File

@@ -226,4 +226,5 @@ ModifierTypeInfo modifierType_MeshToVolume = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_meshcache.cc
View File

@@ -407,4 +407,5 @@ ModifierTypeInfo modifierType_MeshCache = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_meshdeform.cc
View File

@@ -648,4 +648,5 @@ ModifierTypeInfo modifierType_MeshDeform = {
/*panel_register*/ panel_register,
/*blend_write*/ blend_write,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_meshsequencecache.cc
View File

@@ -462,4 +462,5 @@ ModifierTypeInfo modifierType_MeshSequenceCache = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_mirror.cc
View File

@@ -270,4 +270,5 @@ ModifierTypeInfo modifierType_Mirror = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_multires.cc
View File

@@ -513,4 +513,5 @@ ModifierTypeInfo modifierType_Multires = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_nodes.cc
View File

@@ -2294,4 +2294,5 @@ ModifierTypeInfo modifierType_Nodes = {
/*panel_register*/ blender::panel_register,
/*blend_write*/ blender::blend_write,
/*blend_read*/ blender::blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_none.cc
View File

@@ -55,4 +55,5 @@ ModifierTypeInfo modifierType_None = {
/*panel_register*/ nullptr,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_normal_edit.cc
View File

@@ -749,4 +749,5 @@ ModifierTypeInfo modifierType_NormalEdit = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_ocean.cc
View File

@@ -723,4 +723,5 @@ ModifierTypeInfo modifierType_Ocean = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_particleinstance.cc
View File

@@ -670,4 +670,5 @@ ModifierTypeInfo modifierType_ParticleInstance = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_particlesystem.cc
View File

@@ -296,4 +296,5 @@ ModifierTypeInfo modifierType_ParticleSystem = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_remesh.cc
View File

@@ -294,4 +294,5 @@ ModifierTypeInfo modifierType_Remesh = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_screw.cc
View File

@@ -1174,4 +1174,5 @@ ModifierTypeInfo modifierType_Screw = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_shapekey.cc
View File

@@ -136,4 +136,5 @@ ModifierTypeInfo modifierType_ShapeKey = {
/*panel_register*/ nullptr,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_shrinkwrap.cc
View File

@@ -243,4 +243,5 @@ ModifierTypeInfo modifierType_Shrinkwrap = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_simpledeform.cc
View File

@@ -564,4 +564,5 @@ ModifierTypeInfo modifierType_SimpleDeform = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_skin.cc
View File

@@ -2101,4 +2101,5 @@ ModifierTypeInfo modifierType_Skin = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_smooth.cc
View File

@@ -248,4 +248,5 @@ ModifierTypeInfo modifierType_Smooth = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_softbody.cc
View File

@@ -123,4 +123,5 @@ ModifierTypeInfo modifierType_Softbody = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_solidify.cc
View File

@@ -296,4 +296,5 @@ ModifierTypeInfo modifierType_Solidify = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_subsurf.cc
View File

@@ -517,4 +517,5 @@ ModifierTypeInfo modifierType_Subsurf = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_surface.cc
View File

@@ -234,4 +234,5 @@ ModifierTypeInfo modifierType_Surface = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_surfacedeform.cc
View File

@@ -1745,4 +1745,5 @@ ModifierTypeInfo modifierType_SurfaceDeform = {
/*panel_register*/ panel_register,
/*blend_write*/ blend_write,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_triangulate.cc
View File

@@ -162,4 +162,5 @@ ModifierTypeInfo modifierType_Triangulate = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_uvproject.cc
View File

@@ -381,4 +381,5 @@ ModifierTypeInfo modifierType_UVProject = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_uvwarp.cc
View File

@@ -337,4 +337,5 @@ ModifierTypeInfo modifierType_UVWarp = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_volume_displace.cc
View File

@@ -345,4 +345,5 @@ ModifierTypeInfo modifierType_VolumeDisplace = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_volume_to_mesh.cc
View File

@@ -229,4 +229,5 @@ ModifierTypeInfo modifierType_VolumeToMesh = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_warp.cc
View File

@@ -503,4 +503,5 @@ ModifierTypeInfo modifierType_Warp = {
/*panel_register*/ panel_register,
/*blend_write*/ blend_write,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_wave.cc
View File

@@ -452,4 +452,5 @@ ModifierTypeInfo modifierType_Wave = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_weighted_normal.cc
View File

@@ -664,4 +664,5 @@ ModifierTypeInfo modifierType_WeightedNormal = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_weightvgedit.cc
View File

@@ -420,4 +420,5 @@ ModifierTypeInfo modifierType_WeightVGEdit = {
/*panel_register*/ panel_register,
/*blend_write*/ blend_write,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_weightvgmix.cc
View File

@@ -520,4 +520,5 @@ ModifierTypeInfo modifierType_WeightVGMix = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_weightvgproximity.cc
View File

@@ -765,4 +765,5 @@ ModifierTypeInfo modifierType_WeightVGProximity = {
/*panel_register*/ panel_register,
/*blend_write*/ blend_write,
/*blend_read*/ blend_read,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_weld.cc
View File

@@ -214,4 +214,5 @@ ModifierTypeInfo modifierType_Weld = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};

1
source/blender/modifiers/intern/MOD_wireframe.cc
View File

@@ -196,4 +196,5 @@ ModifierTypeInfo modifierType_Wireframe = {
/*panel_register*/ panel_register,
/*blend_write*/ nullptr,
/*blend_read*/ nullptr,
/*foreach_cache*/ nullptr,
};