diff options
author | Bastien Montagne <bastien@blender.org> | 2021-11-19 18:10:28 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2021-11-19 18:10:28 +0300 |
commit | ec71054a9b7bf0d2218fa230855fc9af2e71bcc2 (patch) | |
tree | 742c6c9c97b95936f7d6b9897f9ce350dbdabb8c /source/blender/makesdna | |
parent | 330290d2a80d6b78f323cd1df9f3ea333d1cdb53 (diff) | |
parent | 33c5e7bcd5e5b790ee95caaa0c4d917996341266 (diff) |
Merge branch 'blender-v3.0-release'
Conflicts:
source/blender/blenkernel/BKE_blender_version.h
source/blender/blenloader/intern/versioning_300.c
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_ID.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index d829d707a71..2c04d0b06ef 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -211,11 +211,15 @@ typedef struct IDOverrideLibraryPropertyOperation { char _pad0[2]; /* Sub-item references, if needed (for arrays or collections only). - * We need both reference and local values to allow e.g. insertion into collections + * We need both reference and local values to allow e.g. insertion into RNA collections * (constraints, modifiers...). - * In collection case, if names are defined, they are used in priority. - * Names are pointers (instead of char[64]) to save some space, NULL when unset. - * Indices are -1 when unset. */ + * In RNA collection case, if names are defined, they are used in priority. + * Names are pointers (instead of char[64]) to save some space, NULL or empty string when unset. + * Indices are -1 when unset. + * + * NOTE: For insertion operations in RNA collections, reference may not actually exist in the + * linked reference data. It is used to identify the anchor of the insertion operation (i.e. the + * item after or before which the new local item should be inserted), in the local override. */ char *subitem_reference_name; char *subitem_local_name; int subitem_reference_index; |