diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-06-12 02:04:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-06-12 02:43:49 +0300 |
commit | 6529d20d79a5e55696a2fa48150055d3e4a942dd (patch) | |
tree | 314f21fd4c91f8a5558cfe34e04f6ce1e50d3c98 /source/blender/makesdna | |
parent | 8ce93ef6ae5169297aca67f5439503c3b25dc707 (diff) |
Cleanup: spelling in comments
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_ID.h | 30 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_anim_types.h | 6 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_gpencil_types.h | 10 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_lightprobe_types.h | 3 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_sound_types.h | 2 |
5 files changed, 25 insertions, 26 deletions
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 139cb298710..f06fcd7a727 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -244,7 +244,7 @@ typedef struct ID { /** MAX_ID_NAME. */ char name[66]; /** - * LIB_... flags report on status of the datablock this ID belongs to + * LIB_... flags report on status of the data-block this ID belongs to * (persistent, saved to and read from .blend). */ short flag; @@ -262,7 +262,7 @@ typedef struct ID { IDOverrideStatic *override_static; /** - * Only set for datablocks which are coming from copy-on-write, points to + * Only set for data-blocks which are coming from copy-on-write, points to * the original version of it. */ struct ID *orig_id; @@ -403,7 +403,7 @@ typedef enum ID_Type { ID_LP = MAKE_ID2('L', 'P'), /* LightProbe */ } ID_Type; -/* Only used as 'placeholder' in .blend files for directly linked datablocks. */ +/* Only used as 'placeholder' in .blend files for directly linked data-blocks. */ #define ID_LINK_PLACEHOLDER MAKE_ID2('I', 'D') /* (internal use only) */ /* Deprecated. */ @@ -499,27 +499,27 @@ enum { * to mark IDs needing to be expanded (only done once). */ LIB_TAG_NEED_EXPAND = 1 << 3, /* RESET_AFTER_USE Flag used internally in readfile.c to mark ID - * placeholders for linked datablocks needing to be read. */ + * placeholders for linked data-blocks needing to be read. */ LIB_TAG_ID_LINK_PLACEHOLDER = 1 << 4, /* RESET_AFTER_USE */ LIB_TAG_NEED_LINK = 1 << 5, - /* RESET_NEVER tag datablock as a place-holder + /* RESET_NEVER tag data-block as a place-holder * (because the real one could not be linked from its library e.g.). */ LIB_TAG_MISSING = 1 << 6, - /* RESET_NEVER tag datablock as being up-to-date regarding its reference. */ + /* RESET_NEVER tag data-block as being up-to-date regarding its reference. */ LIB_TAG_OVERRIDESTATIC_REFOK = 1 << 9, - /* RESET_NEVER tag datablock as needing an auto-override execution, if enabled. */ + /* RESET_NEVER tag data-block as needing an auto-override execution, if enabled. */ LIB_TAG_OVERRIDESTATIC_AUTOREFRESH = 1 << 17, - /* tag datablock has having an extra user. */ + /* tag data-block has having an extra user. */ LIB_TAG_EXTRAUSER = 1 << 2, - /* tag datablock has having actually increased usercount for the extra virtual user. */ + /* tag data-block has having actually increased usercount for the extra virtual user. */ LIB_TAG_EXTRAUSER_SET = 1 << 7, /* RESET_AFTER_USE tag newly duplicated/copied IDs. - * Also used internally in readfile.c to mark datablocks needing do_versions. */ + * Also used internally in readfile.c to mark data-blocks needing do_versions. */ LIB_TAG_NEW = 1 << 8, /* RESET_BEFORE_USE free test flag. * TODO make it a RESET_AFTER_USE too. */ @@ -527,12 +527,12 @@ enum { /* RESET_AFTER_USE tag existing data before linking so we know what is new. */ LIB_TAG_PRE_EXISTING = 1 << 11, - /* The datablock is a copy-on-write/localized version. */ + /* The data-block is a copy-on-write/localized version. */ LIB_TAG_COPIED_ON_WRITE = 1 << 12, LIB_TAG_COPIED_ON_WRITE_EVAL_RESULT = 1 << 13, LIB_TAG_LOCALIZED = 1 << 14, - /* RESET_NEVER tag datablock for freeing etc. behavior + /* RESET_NEVER tag data-block for freeing etc. behavior * (usually set when copying real one into temp/runtime one). */ LIB_TAG_NO_MAIN = 1 << 15, /* Datablock is not listed in Main database. */ LIB_TAG_NO_USER_REFCOUNT = 1 << 16, /* Datablock does not refcount usages of other IDs. */ @@ -556,7 +556,7 @@ typedef enum IDRecalcFlag { * When object of other type is tagged with this flag it makes the modifier * stack to be re-evaluated. * When object data type (mesh, curve, ...) gets tagged with this flag it - * makes all objects which shares this datablock to be updated. */ + * makes all objects which shares this data-block to be updated. */ ID_RECALC_GEOMETRY = (1 << 1), /* ** Animation or time changed and animation is to be re-evaluated. ** */ @@ -590,7 +590,7 @@ typedef enum IDRecalcFlag { ID_RECALC_BASE_FLAGS = (1 << 10), ID_RECALC_POINT_CACHE = (1 << 11), /* Only inform editors about the change. Is used to force update of editors - * when datablock which is not a part of dependency graph did change. + * when data-block which is not a part of dependency graph did change. * * For example, brush texture did change and the preview is to be * re-rendered. */ @@ -616,7 +616,7 @@ typedef enum IDRecalcFlag { * Pseudonyms, to have more semantic meaning in the actual code without * using too much low-level and implementation specific tags. */ - /* Update animation datablock itself, without doing full re-evaluation of + /* Update animation data-block itself, without doing full re-evaluation of * all dependent objects. */ ID_RECALC_ANIMATION_NO_FLUSH = ID_RECALC_COPY_ON_WRITE, diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index ecf587301c7..1718aabc51d 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -1006,14 +1006,14 @@ typedef struct AnimOverride { /** * Animation data for some ID block (adt) * - * This block of data is used to provide all of the necessary animation data for a datablock. + * This block of data is used to provide all of the necessary animation data for a data-block. * Currently, this data will not be reusable, as there shouldn't be any need to do so. * * This information should be made available for most if not all ID-blocks, which should * enable all of its settings to be animatable locally. Animation from 'higher-up' ID-AnimData * blocks may override local settings. * - * This datablock should be placed immediately after the ID block where it is used, so that + * This data-block should be placed immediately after the ID block where it is used, so that * the code which retrieves this data can do so in an easier manner. * See blenkernel/intern/anim_sys.c for details. */ @@ -1098,7 +1098,7 @@ typedef enum eAnimData_Flag { /** * Used for #BKE_animdata_from_id() - * All ID-datablocks which have their own 'local' AnimData + * All ID-data-blocks which have their own 'local' AnimData * should have the same arrangement in their structs. */ typedef struct IdAdtTemplate { diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 5a32f9bc23c..307a6f2fe16 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -170,7 +170,7 @@ typedef struct bGPDstroke_Runtime { /* Grease-Pencil Annotations - 'Stroke' * -> A stroke represents a (simplified version) of the curve - * drawn by the user in one 'mousedown'->'mouseup' operation + * drawn by the user in one 'mouse-down'->'mouse-up' operation */ typedef struct bGPDstroke { struct bGPDstroke *next, *prev; @@ -457,7 +457,7 @@ typedef struct bGPgrid { /* Grease-Pencil Annotations - 'DataBlock' */ typedef struct bGPdata { - /** Grease Pencil data is a datablock. */ + /** Grease Pencil data is a data-block. */ ID id; /** Animation data - for animating draw settings. */ struct AnimData *adt; @@ -465,7 +465,7 @@ typedef struct bGPdata { /* Grease-Pencil data */ /** BGPDlayers. */ ListBase layers; - /** Settings for this datablock. */ + /** Settings for this data-block. */ int flag; char _pad1[4]; @@ -532,9 +532,9 @@ typedef struct bGPdata { * changes made during the porting process. */ typedef enum eGPdata_Flag { - /* datablock is used for "annotations" + /* data-block is used for "annotations" * NOTE: This flag used to be used in 2.4x, but should hardly ever have been set. - * We can use this freely now, as all GP datablocks from pre-2.8 will get + * We can use this freely now, as all GP data-blocks from pre-2.8 will get * set on file load (as many old use cases are for "annotations" only) */ GP_DATA_ANNOTATIONS = (1 << 0), diff --git a/source/blender/makesdna/DNA_lightprobe_types.h b/source/blender/makesdna/DNA_lightprobe_types.h index c5121481f88..5cae3c0b1e9 100644 --- a/source/blender/makesdna/DNA_lightprobe_types.h +++ b/source/blender/makesdna/DNA_lightprobe_types.h @@ -114,8 +114,7 @@ enum { }; /* ------- Eevee LightProbes ------- */ -/* Needs to be there because written to file - * with the lightcache. */ +/* Needs to be there because written to file with the light-cache. */ /* IMPORTANT Padding in these structs is essential. It must match * GLSL struct definition in lightprobe_lib.glsl. */ diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h index 3f73270493a..1c1bb9b9ce1 100644 --- a/source/blender/makesdna/DNA_sound_types.h +++ b/source/blender/makesdna/DNA_sound_types.h @@ -88,7 +88,7 @@ typedef struct bSound { */ void *playback_handle; - /** Spinlock for asynchronous loading of sounds. */ + /** Spin-lock for asynchronous loading of sounds. */ void *spinlock; /* XXX unused currently (SOUND_TYPE_LIMITER) */ /* float start, end; */ |