[Bf-blender-cvs] [ca6acceb606] blender-v2.93-release: Fix T93353: Reload Library Override file loses Constraints, take II.
Bastien Montagne
noreply at git.blender.org
Tue Dec 7 16:22:56 CET 2021
Commit: ca6acceb606fd4d4bffd61a1f3efe307f04ee7ac
Author: Bastien Montagne
Date: Tue Nov 30 15:19:30 2021 +0100
Branches: blender-v2.93-release
https://developer.blender.org/rBca6acceb606fd4d4bffd61a1f3efe307f04ee7ac
Fix T93353: Reload Library Override file loses Constraints, take II.
When adding `INSERT` operations over RNACollection items, rna diffing
code did not properly report the properties as not being equals.
This in turn triggered the 'purge unused exiting override properties'
mechanism, thus deleting the exitsting (valid) insert override property
operation.
NOTE: This should also be backported to 2.93, and probably 2.83.
Reviewed By: sybren, jbakker
Maniphest Tasks: T93353
Differential Revision: https://developer.blender.org/D13426
===================================================================
M source/blender/makesrna/intern/rna_rna.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c
index f7a7b745493..559f6cf0a62 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -1949,6 +1949,8 @@ int rna_property_override_diff_default(Main *bmain,
idx_a - 1);
# endif
op = NULL;
+
+ equals = false;
}
else if (is_id || is_valid_for_diffing) {
if (equals || do_create) {
More information about the Bf-blender-cvs
mailing list