diff options
Diffstat (limited to 'source/blender/makesdna/DNA_ID.h')
| -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 263ce2203e9..26824216337 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -193,6 +193,10 @@ enum { IDOVERRIDE_LIBRARY_FLAG_MANDATORY = 1 << 0, /** User cannot change that override operation. */ IDOVERRIDE_LIBRARY_FLAG_LOCKED = 1 << 1, + + /** For overrides of ID pointers: this override still matches (follows) the hierarchy of the + * reference linked data. */ + IDOVERRIDE_LIBRARY_FLAG_IDPOINTER_MATCH_REFERENCE = 1 << 8, }; /** A single overridden property, contain all operations on this one. */ @@ -254,7 +258,7 @@ typedef struct IDOverrideLibrary { /** * ID is the first thing included in all serializable types. It * provides a common handle to place all data in double-linked lists. - * */ + */ /* 2 characters for ID code and 64 for actual name */ #define MAX_ID_NAME 66 @@ -449,7 +453,7 @@ typedef enum ID_Type { ID_TXT = MAKE_ID2('T', 'X'), /* Text */ ID_SPK = MAKE_ID2('S', 'K'), /* Speaker */ ID_SO = MAKE_ID2('S', 'O'), /* Sound */ - ID_GR = MAKE_ID2('G', 'R'), /* Group */ + ID_GR = MAKE_ID2('G', 'R'), /* Collection */ ID_AR = MAKE_ID2('A', 'R'), /* bArmature */ ID_AC = MAKE_ID2('A', 'C'), /* bAction */ ID_NT = MAKE_ID2('N', 'T'), /* bNodeTree */ @@ -468,7 +472,7 @@ typedef enum ID_Type { ID_HA = MAKE_ID2('H', 'A'), /* Hair */ ID_PT = MAKE_ID2('P', 'T'), /* PointCloud */ ID_VO = MAKE_ID2('V', 'O'), /* Volume */ - ID_SIM = MAKE_ID2('S', 'I'), /* Simulation (currently unused) */ + ID_SIM = MAKE_ID2('S', 'I'), /* Simulation (geometry node groups) */ } ID_Type; /* Only used as 'placeholder' in .blend files for directly linked data-blocks. */ @@ -685,7 +689,7 @@ typedef enum IDRecalcFlag { * redraw update in that case. */ /* Selection of the ID itself or its components (for example, vertices) did - * change, and all the drawing data is to eb updated. */ + * change, and all the drawing data is to be updated. */ ID_RECALC_SELECT = (1 << 9), /* Flags on the base did change, and is to be copied onto all the copies of * corresponding objects. */ |