Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2018-02-21 20:22:25 +0300
committerJulian Eisel <eiseljulian@gmail.com>2018-02-21 20:22:25 +0300
commitec6545efad5fed99980fc3e2d5962b40fbeb12ae (patch)
tree31729e5064a46f3663d92cf74a422de50fbd2780 /source/blender/depsgraph/intern/depsgraph.cc
parent3f0871dfcfbb1dda15c176dba92d36639305385a (diff)
parent813204838a268fd8108e9f9bc96bb1b4680c7929 (diff)
Merge branch 'blender2.8' into topbar
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph.cc')
-rw-r--r--source/blender/depsgraph/intern/depsgraph.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc
index 3a78c9050f7..3b5ea2bfc3f 100644
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@ -167,7 +167,7 @@ static bool pointer_to_component_node_criteria(
return true;
}
else if (object->pose != NULL) {
- BLI_LISTBASE_FOREACH(bPoseChannel *, pchan, &object->pose->chanbase) {
+ LISTBASE_FOREACH(bPoseChannel *, pchan, &object->pose->chanbase) {
if (BLI_findindex(&pchan->constraints, con) != -1) {
/* bone transforms */
*type = DEG_NODE_TYPE_BONE;
@@ -220,6 +220,10 @@ static bool pointer_to_component_node_criteria(
*subdata = seq->name; // xxx?
return true;
}
+ else if (RNA_struct_is_a(ptr->type, &RNA_NodeSocket)) {
+ *type = DEG_NODE_TYPE_SHADING;
+ return true;
+ }
if (prop != NULL) {
/* All unknown data effectively falls under "parameter evaluation". */
*type = DEG_NODE_TYPE_PARAMETERS;