From 60eef5c7ff0b5dc45f79a86dc25729500d84bfd2 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 7 Feb 2018 10:57:54 +0100 Subject: Depsgraph: Fix node sockets as driver variables Fixes empty not moving int deg_anim_material_driving_empty. Reported by Mai in IRC, thanks! --- source/blender/depsgraph/intern/depsgraph.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/depsgraph/intern/depsgraph.cc') diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index 3a78c9050f7..01a4aad13ae 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -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; -- cgit v1.2.3 From c0bbc4abf53b406c947b3a0caa1b6a0898eba9c1 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 15 Feb 2018 12:38:21 +0100 Subject: Cleanup: Remove BLI_ prefix from listbase macro This is kind of doesn't matter where macro itself is defined. We should stick to the following: - If some macro is actually more an inline function, follow regular function name conventions. - If macro is a macro, type it in capitals. Use module prefix if that helps readability or it if helps avoiding accidents. --- source/blender/depsgraph/intern/depsgraph.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/depsgraph/intern/depsgraph.cc') diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index a016d623ea9..997e7ad1d40 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -155,7 +155,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; -- cgit v1.2.3