diff options
author | Bastien Montagne <b.mont29@gmail.com> | 2020-03-11 14:47:25 +0300 |
---|---|---|
committer | Bastien Montagne <b.mont29@gmail.com> | 2020-03-11 14:53:10 +0300 |
commit | 68c0d77b0c95a0fca89ca010f9666c4fc3eb9598 (patch) | |
tree | 1c14c1f64de18b1563c87a81688459f3608c86e5 /source/blender/makesdna | |
parent | 8820ab41bda7d639ec7eca3c7b473d903f01238e (diff) |
Cleanup: rename 'private' to 'embedded' for sub-data IDs.
'Private' can be a rather confusing term, especially when considering
its meaning in programming languages.
So now root node trees and master collections are 'embedded' IDs
instead.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_ID.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 3ac93a96661..40916cbdc61 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -465,16 +465,20 @@ typedef enum ID_Type { if ((a) && (a)->id.newid) \ (a) = (void *)(a)->id.newid -/* id->flag (persitent). */ +/** id->flag (persitent). */ enum { - /* Don't delete the datablock even if unused. */ + /** Don't delete the datablock even if unused. */ LIB_FAKEUSER = 1 << 9, - /* The datablock structure is a sub-object of a different one. - * Direct persistent references are not allowed. */ - LIB_PRIVATE_DATA = 1 << 10, - /* Datablock is from a library and linked indirectly, with LIB_TAG_INDIRECT + /** + * The data-block is a sub-data of another one. + * Direct persistent references are not allowed. + */ + LIB_EMBEDDED_DATA = 1 << 10, + /** + * Datablock is from a library and linked indirectly, with LIB_TAG_INDIRECT * tag set. But the current .blend file also has a weak pointer to it that - * we want to restore if possible, and silently drop if it's missing. */ + * we want to restore if possible, and silently drop if it's missing. + */ LIB_INDIRECT_WEAK_LINK = 1 << 11, }; |