diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-05 14:16:53 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-03-05 14:16:53 +0300 |
| commit | c63e9a32e859f7225ea4c964f407047d7a843763 (patch) | |
| tree | 76127898701f1349c8b02ea44d49ba04fc3941ee /source/blender/depsgraph/intern/depsgraph.cc | |
| parent | d1596dc1709701e731fd4943918d2990c7efbee2 (diff) | |
| parent | caa0b0fadf928b4f34be8ce761ac342b72450bcb (diff) | |
Merge branch 'master' into soc-2017-normal-tools
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph.cc')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph.cc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index 841242b995e..2e87786639c 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -214,10 +214,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; |