[Bf-blender-cvs] [a08a2ec54f6] asset-engine: Auto-override detection: ignore animated properties.

[Bastien Montagne]

Commit: a08a2ec54f6124611a8daeea4c82a41e678d4f4d
Author: Bastien Montagne
Date:   Fri Nov 10 17:09:08 2017 +0100
Branches: asset-engine
https://developer.blender.org/rBa08a2ec54f6124611a8daeea4c82a41e678d4f4d

Auto-override detection: ignore animated properties.

Animation is by definition another kind of (dynamic) override of properties,
which supersedes static override.

Note that this could be debated in some corner cases ('differential'
animation, like dloc/drot/dscale), but think we can ignore that for now,
and expect user to handle those manually when needed.

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

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 588b5bedf3c..f7a6e3cc04c 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -8205,6 +8205,9 @@ bool RNA_struct_auto_override(PointerRNA *local, PointerRNA *reference, IDOverri
 		if (!(prop->flag & PROP_OVERRIDABLE)) {
 			continue;
 		}
+		if (RNA_property_animated(local, prop)) {
+			continue;
+		}
 
 		/* XXX TODO this will have to be refined to handle collections insertions, and array items */
 		char *rna_path;