[Bf-blender-cvs] [cbc6c3938d1] blender-v2.83-release: Fix T93353: Reload Library Override file loses Constraints, take II.

Bastien Montagne noreply at git.blender.org
Mon Jan 17 15:56:40 CET 2022


Commit: cbc6c3938d186852bebecb9847694195100dde9f
Author: Bastien Montagne
Date:   Tue Nov 30 15:19:30 2021 +0100
Branches: blender-v2.83-release
https://developer.blender.org/rBcbc6c3938d186852bebecb9847694195100dde9f

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 96e6980aa1d..acc67188688 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -1831,6 +1831,7 @@ int rna_property_override_diff_default(Main *bmain,
                    prev_propname_a,
                    idx_a - 1);
 #  endif
+            equals = false;
           }
           else if (is_id || is_valid_for_diffing) {
             if (equals || do_create) {



More information about the Bf-blender-cvs mailing list