diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-07-27 09:53:32 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-07-27 09:53:32 +0300 |
| commit | 9b867f2e90bd5ba9c2e37ed39cf8b1ad28e39b07 (patch) | |
| tree | 0c6f5c7555e21aae410de7279a5642d4ab333252 /source/blender/depsgraph/intern/builder/deg_builder_rna.h | |
| parent | 3bcec7c1420b5401dbe87286bc3be8c5063cf1f4 (diff) | |
Fix T79121: Dependency cycle when driver points to prop with 'scale' in name
This makes `RNANodeQuery::construct_node_identifier()` more strict in
its matching of certain property names.
The downside of this approach is that it's not possible any more to use
`"rotation"` and expect a match for `"rotation_euler"` and friends, so
the list of strings to test against is now 3x as long.
Reviewed By: sergey
Maniphest Tasks: T79121
Differential Revision: https://developer.blender.org/D8375
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_rna.h')
| -rw-r--r-- | source/blender/depsgraph/intern/builder/deg_builder_rna.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna.h b/source/blender/depsgraph/intern/builder/deg_builder_rna.h index 52d0e5f6b12..c48c6489c47 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_rna.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_rna.h @@ -93,6 +93,19 @@ class RNANodeQuery { /* Make sure ID data exists for the given ID, and returns it. */ RNANodeQueryIDData *ensure_id_data(const ID *id); + + /* Check whether prop_identifier contains rna_path_component. + * + * This checks more than a substring: + * + * prop_identifier contains(prop_identifier, "location") + * ------------------------ ------------------------------------- + * location true + * ["test_location"] false + * pose["bone"].location true + * pose["bone"].location.x true + */ + static bool contains(const char *prop_identifier, const char *rna_path_component); }; } // namespace deg |