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

Merge branch 'blender-v3.6-release'

Browse Source
This commit is contained in:
Jacques Lucke
2023-06-14 14:39:34 +02:00
parent 3298c72ea2 f43dd04aac
commit 345d4087b7
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,6 +103,13 @@ namespace geo_log = blender::nodes::geo_eval_log;
namespace blender {
static blender::bke::sim::ModifierSimulationCachePtr *new_simulation_cache()
{
auto *simulation_cache = MEM_new<blender::bke::sim::ModifierSimulationCachePtr>(__func__);
simulation_cache->ptr = std::make_shared<blender::bke::sim::ModifierSimulationCache>();
return simulation_cache;
}
static void initData(ModifierData *md)
{
NodesModifierData *nmd = (NodesModifierData *)md;
@@ -110,6 +117,8 @@ static void initData(ModifierData *md)
BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(nmd, modifier));
MEMCPY_STRUCT_AFTER(nmd, DNA_struct_default_get(NodesModifierData), modifier);
nmd->simulation_cache = new_simulation_cache();
}
static void add_used_ids_from_sockets(const ListBase &sockets, Set<ID *> &ids)
@@ -1381,13 +1390,6 @@ static void blendWrite(BlendWriter *writer, const ID * /*id_owner*/, const Modif
}
}
static blender::bke::sim::ModifierSimulationCachePtr *new_simulation_cache()
{
auto *simulation_cache = MEM_new<blender::bke::sim::ModifierSimulationCachePtr>(__func__);
simulation_cache->ptr = std::make_shared<blender::bke::sim::ModifierSimulationCache>();
return simulation_cache;
}
static void blendRead(BlendDataReader *reader, ModifierData *md)
{
NodesModifierData *nmd = reinterpret_cast<NodesModifierData *>(md);