[Bf-blender-cvs] [cc63c8511cb] blender2.8: Fix static override (very stupid mistakes in code!)

[Bastien Montagne]

Commit: cc63c8511cb18cc59fb2874dd5a57d89b7123bac
Author: Bastien Montagne
Date:   Thu Jan 11 12:29:09 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBcc63c8511cb18cc59fb2874dd5a57d89b7123bac

Fix static override (very stupid mistakes in code!)

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

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 eb8e1617437..d0cde1f79a3 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -7352,8 +7352,8 @@ bool RNA_struct_override_matches(
 
 	const bool ignore_non_overridable = (flags & RNA_OVERRIDE_COMPARE_IGNORE_NON_OVERRIDABLE) != 0;
 	const bool ignore_overridden = (flags & RNA_OVERRIDE_COMPARE_IGNORE_OVERRIDDEN) != 0;
-	const bool do_create = (flags & RNA_OVERRIDE_COMPARE_IGNORE_NON_OVERRIDABLE) != 0;
-	const bool do_restore = (flags & RNA_OVERRIDE_COMPARE_IGNORE_OVERRIDDEN) != 0;
+	const bool do_create = (flags & RNA_OVERRIDE_COMPARE_CREATE) != 0;
+	const bool do_restore = (flags & RNA_OVERRIDE_COMPARE_RESTORE) != 0;
 
 #ifdef DEBUG_OVERRIDE_TIMEIT
 	static float _sum_time = 0.0f;
@@ -7406,7 +7406,7 @@ bool RNA_struct_override_matches(
 			continue;
 		}
 
-		if (ignore_overridden && BKE_override_static_property_find(override, rna_path) == NULL) {
+		if (ignore_overridden && BKE_override_static_property_find(override, rna_path) != NULL) {
 			MEM_SAFE_FREE(rna_path);
 			continue;
 		}
@@ -7443,7 +7443,8 @@ bool RNA_struct_override_matches(
 						}
 					}
 					else {
-						BLI_assert(!"We have differences between reference and overriding data on non-editable property.");
+						/* Too noisy for now, this triggers on runtime props like transform matrices etc. */
+						/* BLI_assert(!"We have differences between reference and overriding data on non-editable property."); */
 						matching = false;
 					}
 				}