[Bf-blender-cvs] [96995b2343d] master: Fix (unreported) bug in liboverride diffing code for collection item insertion.
Bastien Montagne
noreply at git.blender.org
Fri Nov 20 11:43:41 CET 2020
Commit: 96995b2343d96c75e3d03dbfaf8785fb8b28bfc5
Author: Bastien Montagne
Date: Fri Nov 20 11:41:15 2020 +0100
Branches: master
https://developer.blender.org/rB96995b2343d96c75e3d03dbfaf8785fb8b28bfc5
Fix (unreported) bug in liboverride diffing code for collection item insertion.
In case we do not use names, code adding new insert operations in
collections was broken.
Not a proble in practice so far, since this case was not yet in use, but
will be soon with NLA overrides.
===================================================================
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 45406c3ddd3..eae1c7bc223 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -1879,7 +1879,7 @@ int rna_property_override_diff_default(Main *bmain,
BKE_lib_override_library_property_operation_get(op,
IDOVERRIDE_LIBRARY_OP_INSERT_AFTER,
NULL,
- prev_propname_a,
+ no_prop_name ? NULL : prev_propname_a,
-1,
idx_a - 1,
true,
More information about the Bf-blender-cvs
mailing list