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

Depsgraph: add generic way for modifiers to check user-edited flags

Browse Source 
This implements the design described in #108174.

Pull Request: https://projects.blender.org/blender/blender/pulls/108181
This commit is contained in:
Jacques Lucke
2023-05-23 18:17:42 +02:00
parent 5142d8c831
commit 0d13b0e50d
3 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@@ -915,22 +915,20 @@ void DepsgraphNodeBuilder::build_object_modifiers(Object *object)
deg_evaluate_object_modifiers_mode_node_visibility(depsgraph, id_node);
});
LISTBASE_FOREACH (ModifierData *, modifier, &object->modifiers) {
int modifier_index;
LISTBASE_FOREACH_INDEX (ModifierData *, modifier, &object->modifiers, modifier_index) {
OperationNode *modifier_node = add_operation_node(
&object->id, NodeType::GEOMETRY, OperationCode::MODIFIER, nullptr, modifier->name);
if (modifier->type == eModifierType_Nodes) {
modifier_node->evaluate = [nmd = reinterpret_cast<NodesModifierData *>(modifier),
modifier_node](::Depsgraph *depsgraph) {
if (!DEG_is_active(depsgraph)) {
return;
}
if (modifier_node->flag & DEPSOP_FLAG_USER_MODIFIED) {
if (nmd->simulation_cache &&
nmd->simulation_cache->cache_state() == bke::sim::CacheState::Valid) {
nmd->simulation_cache->invalidate();
}
}
};
modifier_node->evaluate =
[id_node, modifier_index, modifier_node](::Depsgraph * /*depsgraph*/) {
Object *ob_eval = reinterpret_cast<Object *>(id_node->id_cow);
ModifierData *md_eval = reinterpret_cast<ModifierData *>(
BLI_findlink(&ob_eval->modifiers, modifier_index));
/* Set flag that the modifier can check when it is evaluated. */
const bool is_user_modified = modifier_node->flag & DEPSOP_FLAG_USER_MODIFIED;
SET_FLAG_FROM_TEST(md_eval->flag, is_user_modified, eModifierFlag_UserModified);
};
}
/* Mute modifier mode if the modifier is not enabled for the dependency graph mode.

5
source/blender/makesdna/DNA_modifier_types.h
View File

@@ -141,6 +141,11 @@ typedef enum {
* Only one modifier on an object should have this flag set.
*/
eModifierFlag_Active = (1 << 2),
/**
* Only set on modifiers in evaluated objects. The flag indicates that the user modified inputs
* to the modifer which might invalidate simulation caches.
*/
eModifierFlag_UserModified = (1 << 3),
} ModifierFlag;
/**

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

@@ -1158,6 +1158,15 @@ static void prepare_simulation_states_for_evaluation(const NodesModifierData &nm
}
}
{
/* Invalidate cached data on user edits. */
if (nmd.modifier.flag & eModifierFlag_UserModified) {
if (nmd_orig.simulation_cache->cache_state() != bke::sim::CacheState::Baked) {
nmd_orig.simulation_cache->invalidate();
}
}
}
{
/* Reset cached data if necessary. */
const bke::sim::StatesAroundFrame sim_states =