blender/blender
150
479
Fork 710
Code Issues 6.8k Pull Requests 896 Projects 18 Wiki Activity

Geometry Nodes: make evaluation and logging system aware of zones #109029

Closed
Jacques Lucke wants to merge 93 commits from JacquesLucke/blender:zone-evaluation into main
pull from: JacquesLucke/blender:zone-evaluation
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 93 Files Changed 20 +9 -7
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aa99892da9 - Show all commits

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);