[Bf-blender-cvs] [de7f1e8e070] blender-v3.0-release: Fix T93353: Reload Library Override file loses Constraints, take II.

Bastien Montagne noreply at git.blender.org
Tue Nov 30 15:20:29 CET 2021


Commit: de7f1e8e070be93daf8e1a2c7c96f94cabc34867
Author: Bastien Montagne
Date:   Tue Nov 30 15:19:30 2021 +0100
Branches: blender-v3.0-release
https://developer.blender.org/rBde7f1e8e070be93daf8e1a2c7c96f94cabc34867

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 e5009305fe5..285f6365ea1 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -1941,6 +1941,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