diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-02 18:42:27 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-03-02 18:42:27 +0300 |
| commit | c327cf489c4d145407786552e4d9027295754985 (patch) | |
| tree | 9d1cc902a67988fe82d710d922d16794369c9615 /source/blender/depsgraph/intern/depsgraph.cc | |
| parent | f9f559a05fc16e66031210e62bd7bc51d26208a3 (diff) | |
| parent | f76d49ed9504612cc5ba3956b53f920f7c93bd20 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph.cc | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index 987a0654cca..ee4ffee772e 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -140,7 +140,7 @@ static bool pointer_to_component_node_criteria( *type = DEG_NODE_TYPE_PARAMETERS; *subdata = ""; *operation_code = DEG_OPCODE_PARAMETERS_EVAL; - *operation_name = pchan->name;; + *operation_name = pchan->name; } else { /* Bone - generally, we just want the bone component. */ @@ -230,10 +230,18 @@ static bool pointer_to_component_node_criteria( } if (prop != NULL) { /* All unknown data effectively falls under "parameter evaluation". */ - *type = DEG_NODE_TYPE_PARAMETERS; - *operation_code = DEG_OPCODE_PARAMETERS_EVAL; - *operation_name = ""; - *operation_name_tag = -1; + if (RNA_property_is_idprop(prop)) { + *type = DEG_NODE_TYPE_PARAMETERS; + *operation_code = DEG_OPCODE_ID_PROPERTY; + *operation_name = RNA_property_identifier((PropertyRNA *)prop); + *operation_name_tag = -1; + } + else { + *type = DEG_NODE_TYPE_PARAMETERS; + *operation_code = DEG_OPCODE_PARAMETERS_EVAL; + *operation_name = ""; + *operation_name_tag = -1; + } return true; } return false; |