From fe5e8593b7d1fb64fda9d853834f6002040dd607 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 4 Dec 2017 18:00:24 +0100 Subject: [PATCH] Depsgraph: Remove confusing ID node criteria it sometimes overrides all possible other criteria, even tho we might want to be very specific about what component we are looking for here. --- source/blender/depsgraph/intern/depsgraph.cc | 22 +------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index a1251a4f425..295bc398061 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -91,22 +91,6 @@ Depsgraph::~Depsgraph() /* Query Conditions from RNA ----------------------- */ -static bool pointer_to_id_node_criteria(const PointerRNA *ptr, - const PropertyRNA *prop, - ID **id) -{ - if (ptr->type == NULL) { - return false; - } - if (prop != NULL) { - if (RNA_struct_is_ID(ptr->type)) { - *id = (ID *)ptr->data; - return true; - } - } - return false; -} - static bool pointer_to_component_node_criteria( const PointerRNA *ptr, const PropertyRNA *prop, @@ -230,11 +214,7 @@ DepsNode *Depsgraph::find_node_from_pointer(const PointerRNA *ptr, eDepsOperation_Code operation_code; int operation_name_tag; - /* Get querying conditions. */ - if (pointer_to_id_node_criteria(ptr, prop, &id)) { - return find_id_node(id); - } - else if (pointer_to_component_node_criteria( + if (pointer_to_component_node_criteria( ptr, prop, &id, &node_type, &component_name, &operation_code, &operation_name, &operation_name_tag))