blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Geometry Nodes: add simulation support #104924

Closed
Hans Goudey wants to merge 211 commits from geometry-nodes-simulation into main
pull from: geometry-nodes-simulation
merge into: blender:main

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

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

@ -2011,12 +2011,11 @@ static void copyData(const ModifierData *md, ModifierData *target, const int fla
BKE_modifier_copydata_generic(md, target, flag);
tnmd->runtime_eval_log = nullptr;
tnmd->simulation_cache = nullptr;
if (nmd->settings.properties != nullptr) {
tnmd->settings.properties = IDP_CopyProperty_ex(nmd->settings.properties, flag);
}
tnmd->simulation_cache = nullptr;
}
static void freeData(ModifierData *md)
@ -2027,7 +2026,7 @@ static void freeData(ModifierData *md)
nmd->settings.properties = nullptr;
}
MEM_delete(nmd->simulation_cache);
MEM_delete(nmd->simulation_cache);
clear_runtime_data(nmd);
}