[Bf-blender-cvs] [922da6dfb40] master: LibOverride: Fix inverted logic in RNA collection operation application.

[Bastien Montagne]

Commit: 922da6dfb400514f03145b7a96c15d978fb7141c
Author: Bastien Montagne
Date:   Wed Aug 21 17:10:40 2019 +0200
Branches: master
https://developer.blender.org/rB922da6dfb400514f03145b7a96c15d978fb7141c

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.

===================================================================

M	source/blender/makesrna/intern/rna_access.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index b78a3304cc7..fb3aad8ddba 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -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) {