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

Refactor: Move geometry nodes execute implementation for reusability #108482

Merged
Hans Goudey merged 11 commits from HooglyBoogly/blender:geometry-nodes-separate-execute into main 2023-06-12 13:31:15 +02:00
Conversation 3 Commits 11 Files Changed 4 +17 -9
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f9fd684a9f - Show all commits

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

@ -773,22 +773,25 @@ static void modifyGeometry(ModifierData *md,
nmd_orig->runtime_eval_log = new geo_log::GeoModifierLog();
}
bke::ModifierComputeContext modifier_compute_context{nullptr, nmd->modifier.name};
MultiValueMap<ComputeContextHash, const lf::FunctionNode *> side_effect_nodes;
Set<ComputeContextHash> socket_log_contexts;
nodes::GeoNodesModifierData modifier_eval_data{};
modifier_eval_data.depsgraph = ctx->depsgraph;
modifier_eval_data.self_object = ctx->object;
modifier_eval_data.eval_log = static_cast<geo_log::GeoModifierLog *>(nmd_orig->runtime_eval_log);
if (modifier_eval_data.eval_log) {
find_side_effect_nodes(*nmd, *ctx, side_effect_nodes);
modifier_eval_data.side_effect_nodes = &side_effect_nodes;
auto eval_log = std::make_unique<geo_log::GeoModifierLog>();
prepare_simulation_states_for_evaluation(*nmd, *nmd_orig, *ctx, modifier_eval_data);
Set<ComputeContextHash> socket_log_contexts;
if (logging_enabled(ctx)) {
modifier_eval_data.eval_log = eval_log.get();
find_socket_log_contexts(*nmd, *ctx, socket_log_contexts);
modifier_eval_data.socket_log_contexts = &socket_log_contexts;
}
MultiValueMap<ComputeContextHash, const lf::FunctionNode *> side_effect_nodes;
find_side_effect_nodes(*nmd, *ctx, side_effect_nodes);
modifier_eval_data.side_effect_nodes = &side_effect_nodes;
prepare_simulation_states_for_evaluation(*nmd, *nmd_orig, *ctx, modifier_eval_data);
bke::ModifierComputeContext modifier_compute_context{nullptr, nmd->modifier.name};
geometry_set = nodes::execute_geometry_nodes_on_geometry(
tree,
@ -799,6 +802,11 @@ static void modifyGeometry(ModifierData *md,
user_data.modifier_data = &modifier_eval_data;
});
if (logging_enabled(ctx)) {
delete static_cast<geo_log::GeoModifierLog *>(nmd_orig->runtime_eval_log);
nmd_orig->runtime_eval_log = eval_log.release();
}
if (DEG_is_active(ctx->depsgraph)) {
/* When caching is turned off, remove all states except the last which was just created in this
* evaluation. Check if active status to avoid changing original data in other depsgraphs. */