bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Depsgraph: Remove confusing ID node criteria

Browse Source 
it sometimes overrides all possible other criteria, even tho we might want to
be very specific about what component we are looking for here.
This commit is contained in:
Sergey Sharybin 2017-12-04 18:00:24 +01:00
parent 35364e2fb2
commit fe5e8593b7
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/depsgraph/intern/depsgraph.cc
View File

@ -91,22 +91,6 @@ Depsgraph::~Depsgraph()
/* Query Conditions from RNA ----------------------- */ /* 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( static bool pointer_to_component_node_criteria(
const PointerRNA *ptr, const PointerRNA *ptr,
const PropertyRNA *prop, const PropertyRNA *prop,
@ -230,11 +214,7 @@ DepsNode *Depsgraph::find_node_from_pointer(const PointerRNA *ptr,
eDepsOperation_Code operation_code; eDepsOperation_Code operation_code;
int operation_name_tag; int operation_name_tag;
/* Get querying conditions. */ if (pointer_to_component_node_criteria(
if (pointer_to_id_node_criteria(ptr, prop, &id)) {
return find_id_node(id);
}
else if (pointer_to_component_node_criteria(
ptr, prop, ptr, prop,
&id, &node_type, &component_name, &id, &node_type, &component_name,
&operation_code, &operation_name, &operation_name_tag)) &operation_code, &operation_name, &operation_name_tag))