From 0cff044d84646c2890f13b8915eb708861bb36d6 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 24 Sep 2018 17:27:41 +0200 Subject: Spelling fixes in comments and descriptions, patch by luzpaz. Differential Revision: https://developer.blender.org/D3719 --- source/blender/makesdna/DNA_ID.h | 6 +++--- source/blender/makesdna/DNA_armature_types.h | 2 +- source/blender/makesdna/DNA_constraint_types.h | 4 ++-- source/blender/makesdna/DNA_gpencil_types.h | 2 +- source/blender/makesdna/DNA_mask_types.h | 2 +- source/blender/makesdna/DNA_modifier_types.h | 2 +- source/blender/makesdna/DNA_object_fluidsim_types.h | 2 +- source/blender/makesdna/DNA_particle_types.h | 4 ++-- source/blender/makesdna/DNA_rigidbody_types.h | 2 +- source/blender/makesdna/DNA_sequence_types.h | 2 +- source/blender/makesdna/DNA_smoke_types.h | 2 +- source/blender/makesdna/DNA_space_types.h | 2 +- source/blender/makesdna/DNA_tracking_types.h | 2 +- source/blender/makesdna/DNA_userdef_types.h | 8 ++++---- source/blender/makesdna/DNA_windowmanager_types.h | 2 +- source/blender/makesdna/intern/dna_genfile.c | 6 +++--- source/blender/makesdna/intern/makesdna.c | 4 ++-- 17 files changed, 27 insertions(+), 27 deletions(-) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 0c7341b0fae..e9bc0f41980 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -176,9 +176,9 @@ enum ePreviewImage_Flag { /* for PreviewImage->tag */ enum { - PRV_TAG_DEFFERED = (1 << 0), /* Actual loading of preview is deffered. */ - PRV_TAG_DEFFERED_RENDERING = (1 << 1), /* Deffered preview is being loaded. */ - PRV_TAG_DEFFERED_DELETE = (1 << 2), /* Deffered preview should be deleted asap. */ + PRV_TAG_DEFFERED = (1 << 0), /* Actual loading of preview is deferred. */ + PRV_TAG_DEFFERED_RENDERING = (1 << 1), /* Deferred preview is being loaded. */ + PRV_TAG_DEFFERED_DELETE = (1 << 2), /* Deferred preview should be deleted asap. */ }; typedef struct PreviewImage { diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h index f1fe370788d..a7c9c934304 100644 --- a/source/blender/makesdna/DNA_armature_types.h +++ b/source/blender/makesdna/DNA_armature_types.h @@ -111,7 +111,7 @@ typedef struct bArmature { unsigned int layer_used; /* for UI, to show which layers are there */ unsigned int layer, layer_protected; /* for buttons to work, both variables in this order together */ -// XXX deprecated... old animaton system (armature only viz) --- +// XXX deprecated... old animation system (armature only viz) --- short ghostep, ghostsize; /* number of frames to ghosts to show, and step between them */ short ghosttype, pathsize; /* ghost drawing options and number of frames between points of path */ int ghostsf, ghostef; /* start and end frames of ghost-drawing range */ diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h index 2ae686d178e..0239c236e5c 100644 --- a/source/blender/makesdna/DNA_constraint_types.h +++ b/source/blender/makesdna/DNA_constraint_types.h @@ -121,7 +121,7 @@ typedef struct bPythonConstraint { ListBase targets; /* a list of targets that this constraint has (bConstraintTarget-s) */ struct Object *tar; /* target from previous implementation (version-patch sets this to NULL on file-load) */ - char subtarget[64]; /* subtarger from previous implentation (version-patch sets this to "" on file-load), MAX_ID_NAME-2 */ + char subtarget[64]; /* subtarger from previous implementation (version-patch sets this to "" on file-load), MAX_ID_NAME-2 */ } bPythonConstraint; @@ -641,7 +641,7 @@ typedef enum eTrackTo_Flags { TARGET_Z_UP = (1<<0) } eTrackTo_Flags; -/* Strech To Constraint -> volmode */ +/* Stretch To Constraint -> volmode */ typedef enum eStretchTo_VolMode { VOLUME_XZ = 0, VOLUME_X = 1, diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 45f2d6c70e4..ed2f4d69392 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -160,7 +160,7 @@ typedef struct bGPDstroke { struct bGPDstroke *next, *prev; bGPDspoint *points; /* array of data-points for stroke */ - bGPDtriangle *triangles;/* tesselated triangles for GP Fill */ + bGPDtriangle *triangles;/* tessellated triangles for GP Fill */ int totpoints; /* number of data-points in array */ int tot_triangles; /* number of triangles in array */ diff --git a/source/blender/makesdna/DNA_mask_types.h b/source/blender/makesdna/DNA_mask_types.h index b84292d0519..9d4b68b7242 100644 --- a/source/blender/makesdna/DNA_mask_types.h +++ b/source/blender/makesdna/DNA_mask_types.h @@ -88,7 +88,7 @@ typedef struct MaskSplinePoint { typedef struct MaskSpline { struct MaskSpline *next, *prev; - short flag; /* defferent spline flag (closed, ...) */ + short flag; /* different spline flag (closed, ...) */ char offset_mode; /* feather offset method */ char weight_interp; /* weight interpolation */ diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 00ae9ff8b60..ad5f3768b93 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -870,7 +870,7 @@ typedef struct SimpleDeformModifierData { float limit[2]; /* lower and upper limit */ char mode; /* deform function */ - char axis; /* lock axis (for taper and strech) */ + char axis; /* lock axis (for taper and stretch) */ char deform_axis; /* axis to perform the deform on (default is X, but can be overridden by origin */ char flag; diff --git a/source/blender/makesdna/DNA_object_fluidsim_types.h b/source/blender/makesdna/DNA_object_fluidsim_types.h index 0b0c1c40ef4..9ddae38edf2 100644 --- a/source/blender/makesdna/DNA_object_fluidsim_types.h +++ b/source/blender/makesdna/DNA_object_fluidsim_types.h @@ -102,7 +102,7 @@ typedef struct FluidsimSettings { /* additional flags depending on the type, lower short contains flags * to check validity, higher short additional flags */ short typeFlags; - /* switch off velocity genration, volume init type for fluid/obstacles (volume=1, shell=2, both=3) */ + /* switch off velocity generation, volume init type for fluid/obstacles (volume=1, shell=2, both=3) */ char domainNovecgen, volumeInitType; /* boundary "stickiness" for part slip values */ diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index a96354f05c1..26a99f49d86 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -106,7 +106,7 @@ typedef struct ParticleData { int totkey; /* amount of hair or keyed keys*/ - float time, lifetime; /* dietime is not nescessarily time+lifetime as */ + float time, lifetime; /* dietime is not necessarily time+lifetime as */ float dietime; /* particles can die unnaturally (collision). */ /* WARNING! Those two indices, when not affected to vertices, are for !!! TESSELLATED FACES !!!, not POLYGONS! */ @@ -355,7 +355,7 @@ typedef enum eParticleDrawFlag { } eParticleDrawFlag; /* part->type */ -/* hair is allways baked static in object/geometry space */ +/* hair is always baked static in object/geometry space */ /* other types (normal particles) are in global space and not static baked */ #define PART_EMITTER 0 //#define PART_REACTOR 1 diff --git a/source/blender/makesdna/DNA_rigidbody_types.h b/source/blender/makesdna/DNA_rigidbody_types.h index 19e49644816..dbfd3921b8b 100644 --- a/source/blender/makesdna/DNA_rigidbody_types.h +++ b/source/blender/makesdna/DNA_rigidbody_types.h @@ -102,7 +102,7 @@ typedef struct RigidBodyOb { short shape; /* (eRigidBody_Shape) collision shape to use */ int flag; /* (eRigidBodyOb_Flag) */ - int col_groups; /* Collision groups that determines wich rigid bodies can collide with each other */ + int col_groups; /* Collision groups that determines which rigid bodies can collide with each other */ short mesh_source; /* (eRigidBody_MeshSource) mesh source for mesh based collision shapes */ short pad; diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index ef076c98b5f..6e2fd412445 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -126,7 +126,7 @@ typedef struct Strip { * each of the strips uses a different sequence structure. * * \warning The first part identical to ID (for use in ipo's) - * the commend above is historic, probably we can drop the ID compatibility, + * the comment above is historic, probably we can drop the ID compatibility, * but take care making this change. * * \warning This is really a 'Strip' in the UI!, name is highly confusing. diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h index d74d46aebbd..ee7e080f39b 100644 --- a/source/blender/makesdna/DNA_smoke_types.h +++ b/source/blender/makesdna/DNA_smoke_types.h @@ -113,7 +113,7 @@ enum { #define SM_HRES_LINEAR 1 #define SM_HRES_FULLSAMPLE 2 -/* smoke data fileds (active_fields) */ +/* smoke data fields (active_fields) */ #define SM_ACTIVE_HEAT (1<<0) #define SM_ACTIVE_FIRE (1<<1) #define SM_ACTIVE_COLORS (1<<2) diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 6879c3044a6..e94364e8a65 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -423,7 +423,7 @@ typedef struct SpaceNla { /* SpaceNla.flag */ typedef enum eSpaceNla_Flag { - /* flags (1<<0), (1<<1), and (1<<3) are deprecated flags from old verisons */ + /* flags (1<<0), (1<<1), and (1<<3) are deprecated flags from old versions */ /* draw timing in seconds instead of frames */ SNLA_DRAWTIME = (1 << 2), diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h index 42b72c1ff93..bfd9edceab4 100644 --- a/source/blender/makesdna/DNA_tracking_types.h +++ b/source/blender/makesdna/DNA_tracking_types.h @@ -108,7 +108,7 @@ typedef struct MovieTrackingTrack { char name[64]; /* MAX_NAME */ - /* ** setings ** */ + /* ** settings ** */ /* positions of left-bottom and right-top corners of pattern (in unified 0..1 units, * relative to marker->pos) diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index e8cc4fbe38f..aea5f0fd87b 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -59,7 +59,7 @@ typedef enum eUIFont_ID { UIFONT_CUSTOM2 = 3 } eUIFont_ID; -/* default fonts to load/initalize */ +/* default fonts to load/initialize */ /* first font is the default (index 0), others optional */ typedef struct uiFont { struct uiFont *next, *prev; @@ -168,7 +168,7 @@ typedef struct ThemeUI { uiWidgetStateColors wcol_state; - uiPanelColors panel; /* depricated, but we keep it for do_versions (2.66.1) */ + uiPanelColors panel; /* deprecated, but we keep it for do_versions (2.66.1) */ char widget_emboss[4]; @@ -513,7 +513,7 @@ typedef struct UserDef { short rvisize; /* rotating view icon size */ short rvibright; /* rotating view icon brightness */ short recent_files; /* maximum number of recently used files to remember */ - short smooth_viewtx; /* miliseconds to spend spinning the view */ + short smooth_viewtx; /* milliseconds to spend spinning the view */ short glreslimit; short curssize; short color_picker_type; /* eColorPicker_Types */ @@ -670,7 +670,7 @@ typedef enum eUserpref_UI_Flag { USER_PLAINMENUS = (1 << 5), USER_LOCK_CURSOR_ADJUST = (1 << 6), /* Avoid accidentally adjusting the layout - * (exact behavior may change based on whats considered reasonable to lock down). */ + * (exact behavior may change based on what's considered reasonable to lock down). */ USER_UIFLAG_DEPRECATED_7 = (1 << 7), USER_ALLWINCODECS = (1 << 8), USER_MENUOPENAUTO = (1 << 9), diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h index 7e55eb4633e..c76a447097e 100644 --- a/source/blender/makesdna/DNA_windowmanager_types.h +++ b/source/blender/makesdna/DNA_windowmanager_types.h @@ -174,7 +174,7 @@ enum { # endif #endif -/* the savable part, rest of data is local in ghostwinlay */ +/* the saveable part, rest of data is local in ghostwinlay */ typedef struct wmWindow { struct wmWindow *next, *prev; diff --git a/source/blender/makesdna/intern/dna_genfile.c b/source/blender/makesdna/intern/dna_genfile.c index 9f29249c239..077bae741b8 100644 --- a/source/blender/makesdna/intern/dna_genfile.c +++ b/source/blender/makesdna/intern/dna_genfile.c @@ -102,7 +102,7 @@ * * ALLOWED AND TESTED CHANGES IN STRUCTS: * - type change (a char to float will be divided by 255) - * - location within a struct (everthing can be randomly mixed up) + * - location within a struct (everything can be randomly mixed up) * - struct within struct (within struct etc), this is recursive * - adding new elements, will be default initialized zero * - removing elements @@ -901,7 +901,7 @@ static int elem_strcmp(const char *name, const char *oname) * \param type Current field type name * \param name Current field name * \param old Pointer to struct information in sdna - * \return true when existsing, false otherwise. + * \return true when existing, false otherwise. */ static bool elem_exists( const SDNA *sdna, @@ -1259,7 +1259,7 @@ void DNA_struct_switch_endian(const SDNA *oldsdna, int oldSDNAnr, char *data) else if (ELEM(spc[0], SDNA_TYPE_INT, SDNA_TYPE_FLOAT)) { /* note, intentionally ignore long/ulong here these could be 4 or 8 bits, * but turns out we only used for runtime vars and - * only once for a struct type thats no longer used. */ + * only once for a struct type that's no longer used. */ BLI_endian_switch_int32_array((int32_t *)cur, DNA_elem_array_size(name)); } diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c index 3b8d0e01ace..bf94c07baa1 100644 --- a/source/blender/makesdna/intern/makesdna.c +++ b/source/blender/makesdna/intern/makesdna.c @@ -984,7 +984,7 @@ static int make_structDNA(const char *baseDirectory, FILE *file, FILE *file_offs printf("Running makesdna at debug level %d\n", debugSDNA); } - /* the longest known struct is 50k, so we assume 100k is sufficent! */ + /* the longest known struct is 50k, so we assume 100k is sufficient! */ namedata = MEM_callocN(maxdata, "namedata"); typedata = MEM_callocN(maxdata, "typedata"); structdata = MEM_callocN(maxdata, "structdata"); @@ -1258,7 +1258,7 @@ int main(int argc, char **argv) return(return_status); } -/* handy but fails on struct bounds which makesdna doesnt care about +/* handy but fails on struct bounds which makesdna doesn't care about * with quite the same strictness as GCC does */ #if 0 /* include files for automatic dependencies */ -- cgit v1.2.3