diff options
| author | Jacques Lucke <jacques@blender.org> | 2021-07-14 12:25:15 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2021-07-14 12:25:15 +0300 |
| commit | 192f0c9e17e233ecc3a66432d34abeb5a3741739 (patch) | |
| tree | 35baa8551a0e7eff8fcf308adc3c4be29da23d1c /source/blender/depsgraph/intern/builder/deg_builder_rna.cc | |
| parent | 271f34f77e056611e5e227b60823dd94f76340df (diff) | |
Fix T89734: incorrect dependency cycle with id property on modifier
Differential Revision: https://developer.blender.org/D11851
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_rna.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_rna.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc index 2ae29dea213..8e3960e1a15 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc @@ -180,8 +180,7 @@ RNANodeIdentifier RNANodeQuery::construct_node_identifier(const PointerRNA *ptr, node_identifier.operation_name = ""; node_identifier.operation_name_tag = -1; /* Handling of commonly known scenarios. */ - if (prop != nullptr && RNA_property_is_idprop(prop) && - !RNA_struct_is_a(ptr->type, &RNA_Modifier)) { + if (rna_prop_affects_parameters_node(ptr, prop)) { node_identifier.type = NodeType::PARAMETERS; node_identifier.operation_code = OperationCode::ID_PROPERTY; node_identifier.operation_name = RNA_property_identifier( @@ -398,4 +397,12 @@ RNANodeQueryIDData *RNANodeQuery::ensure_id_data(const ID *id) return id_data.get(); } +bool rna_prop_affects_parameters_node(const PointerRNA *ptr, const PropertyRNA *prop) +{ + return prop != nullptr && RNA_property_is_idprop(prop) && + /* ID properties in the geometry nodes modifier don't affect that parameters node. Instead + they affect the modifier and therefore the geometry node directly. */ + !RNA_struct_is_a(ptr->type, &RNA_NodesModifier); +} + } // namespace blender::deg |