Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2018-03-26 11:41:31 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2018-03-26 11:41:31 +0300
commit13f80a152a3a84286330b1bc6d9818279b976e91 (patch)
treed8a89c2f49a8d342cda3752f2c1ce55fbf787d99
parent0c49d83b495f66c749fc9158e0b2eb9356b1075f (diff)
Fix T53800: Bad data editing during DEG evaluation?
Remain convinced that it should not be possible for undo code to run in parallel with DEG eval... But for now, this whould prevent static override code to dive into this collection.
-rw-r--r--source/blender/makesrna/intern/rna_object.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index aa78b9e614d..80449a77b14 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -2835,6 +2835,7 @@ static void rna_def_object(BlenderRNA *brna)
NULL,
NULL);
RNA_def_property_struct_type(prop, "LayerCollectionSettings");
+ RNA_def_property_flag(prop, PROP_NO_COMPARISON); /* XXX see T53800. */
RNA_def_property_ui_text(prop, "Collection Settings",
"Engine specific render settings to be overridden by collections");