blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

LibOverride: Fix inverted logic in RNA collection operation application. 

Note to self: need to recheck the namings of whole override code,
currently this is way to confusing and inconsistent.
This commit is contained in:
Bastien Montagne 2019-08-21 17:10:40 +02:00
parent 654fd58270
commit 922da6dfb4
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/blender/makesrna/intern/rna_access.c
View File

@ -8871,45 +8871,41 @@ static void rna_property_override_apply_ex(Main *bmain,
RNA_POINTER_INVALIDATE(&private_ptr_item_storage);
if (opop->subitem_local_name != NULL) {
RNA_property_collection_lookup_string(
ptr_local, prop_local, opop->subitem_local_name, &private_ptr_item_local);
ptr_override, prop_override, opop->subitem_local_name, &private_ptr_item_override);
if (opop->subitem_reference_name != NULL) {
RNA_property_collection_lookup_string(ptr_override,
prop_override,
opop->subitem_reference_name,
&private_ptr_item_override);
RNA_property_collection_lookup_string(
ptr_local, prop_local, opop->subitem_reference_name, &private_ptr_item_local);
}
else {
RNA_property_collection_lookup_string(
ptr_override, prop_override, opop->subitem_local_name, &private_ptr_item_override);
ptr_local, prop_local, opop->subitem_local_name, &private_ptr_item_local);
}
}
else if (opop->subitem_reference_name != NULL) {
RNA_property_collection_lookup_string(
ptr_local, prop_local, opop->subitem_reference_name, &private_ptr_item_local);
RNA_property_collection_lookup_string(
ptr_override, prop_override, opop->subitem_reference_name, &private_ptr_item_override);
RNA_property_collection_lookup_string(
ptr_local, prop_local, opop->subitem_reference_name, &private_ptr_item_local);
}
else if (opop->subitem_local_index != -1) {
RNA_property_collection_lookup_int(
ptr_local, prop_local, opop->subitem_local_index, &private_ptr_item_local);
ptr_override, prop_override, opop->subitem_local_index, &private_ptr_item_override);
if (opop->subitem_reference_index != -1) {
RNA_property_collection_lookup_int(ptr_override,
prop_override,
opop->subitem_reference_index,
&private_ptr_item_override);
RNA_property_collection_lookup_int(
ptr_local, prop_local, opop->subitem_reference_index, &private_ptr_item_local);
}
else {
RNA_property_collection_lookup_int(
ptr_override, prop_override, opop->subitem_local_index, &private_ptr_item_override);
ptr_local, prop_local, opop->subitem_local_index, &private_ptr_item_local);
}
}
else if (opop->subitem_reference_index != -1) {
RNA_property_collection_lookup_int(
ptr_local, prop_local, opop->subitem_reference_index, &private_ptr_item_local);
RNA_property_collection_lookup_int(ptr_override,
prop_override,
opop->subitem_reference_index,
&private_ptr_item_override);
RNA_property_collection_lookup_int(
ptr_local, prop_local, opop->subitem_reference_index, &private_ptr_item_local);
}
if (prop_storage != NULL) {
if (opop->subitem_local_name != NULL) {