diff options
| -rw-r--r-- | intern/cycles/render/sky_model.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_rigidbody.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/BLI_ghash.c | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/edgehash.c | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/threads.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/animation/anim_markers.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/space_file/filelist.c | 3 | ||||
| -rw-r--r-- | source/creator/creator.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/render/sky_model.h b/intern/cycles/render/sky_model.h index 4f0833aef5a..3814543c8b6 100644 --- a/intern/cycles/render/sky_model.h +++ b/intern/cycles/render/sky_model.h @@ -136,7 +136,7 @@ and solar radii: 'arhosekskymodelstate_alienworld_alloc_init()'. See the notes about the "Alien World" functionality provided further down for a discussion of the usefulness and limits of that second initalisation function. -Sky model states that have been initialised with either function behave in a +Sky model states that have been initialized with either function behave in a completely identical fashion during use and cleanup. Using the model to generate skydome samples diff --git a/source/blender/blenkernel/BKE_rigidbody.h b/source/blender/blenkernel/BKE_rigidbody.h index ef5b8349d60..34ed4f2c8b1 100644 --- a/source/blender/blenkernel/BKE_rigidbody.h +++ b/source/blender/blenkernel/BKE_rigidbody.h @@ -57,7 +57,7 @@ void BKE_rigidbody_relink_constraint(struct RigidBodyCon *rbc); /* -------------- */ /* Setup */ -/* create Blender-side settings data - physics objects not initialised yet */ +/* create Blender-side settings data - physics objects not initialized yet */ struct RigidBodyWorld *BKE_rigidbody_create_world(struct Scene *scene); struct RigidBodyOb *BKE_rigidbody_create_object(struct Scene *scene, struct Object *ob, short type); struct RigidBodyCon *BKE_rigidbody_create_constraint(struct Scene *scene, struct Object *ob, short type); diff --git a/source/blender/blenlib/intern/BLI_ghash.c b/source/blender/blenlib/intern/BLI_ghash.c index fcca6cd59ba..f3ebddddc8c 100644 --- a/source/blender/blenlib/intern/BLI_ghash.c +++ b/source/blender/blenlib/intern/BLI_ghash.c @@ -136,7 +136,7 @@ BLI_INLINE void ghash_resize_buckets(GHash *gh, const unsigned int nbuckets) } /** - * Increase initial bucket size to match a reserved ammount. + * Increase initial bucket size to match a reserved amount. */ BLI_INLINE void ghash_buckets_reserve(GHash *gh, const unsigned int nentries_reserve) { diff --git a/source/blender/blenlib/intern/edgehash.c b/source/blender/blenlib/intern/edgehash.c index b26e007b3e6..50dcd01207d 100644 --- a/source/blender/blenlib/intern/edgehash.c +++ b/source/blender/blenlib/intern/edgehash.c @@ -137,7 +137,7 @@ BLI_INLINE void edgehash_resize_buckets(EdgeHash *eh, const unsigned int nbucket } /** - * Increase initial bucket size to match a reserved ammount. + * Increase initial bucket size to match a reserved amount. */ BLI_INLINE void edgehash_buckets_reserve(EdgeHash *eh, const unsigned int nentries_reserve) { diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c index 4361583dafc..0b8f5dfdde5 100644 --- a/source/blender/blenlib/intern/threads.c +++ b/source/blender/blenlib/intern/threads.c @@ -166,7 +166,7 @@ TaskScheduler *BLI_task_scheduler_get(void) if (task_scheduler == NULL) { int tot_thread = BLI_system_thread_count(); - /* Do a lazy initialization, so it happes after + /* Do a lazy initialization, so it happens after * command line arguments parsing */ task_scheduler = BLI_task_scheduler_create(tot_thread); diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index b057ea239f0..cab072675b2 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -732,7 +732,6 @@ static int ed_marker_move_modal(bContext *C, wmOperator *op, const wmEvent *even case ESCKEY: ed_marker_move_cancel(C, op); return OPERATOR_CANCELLED; - case RIGHTMOUSE: /* press = user manually demands transform to be canceled */ if (event->val == KM_PRESS) { diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index acba9934dd2..822d1ba8bca 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -804,7 +804,8 @@ static int path_extension_type(const char *path) else if (BLI_testextensie(path, ".ogg")) { if (IMB_isanim(path)) { return MOVIEFILE; - } else { + } + else { return SOUNDFILE; } } diff --git a/source/creator/creator.c b/source/creator/creator.c index 1596fe5359c..54fc80984f3 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -1470,7 +1470,7 @@ int main(int argc, const char **argv) #endif #ifdef WIN32 /* Win32 Unicode Args */ - /* NOTE: cannot use guardedalloc malloc here, as it's not yet initialised + /* NOTE: cannot use guardedalloc malloc here, as it's not yet initialized * (it depends on the args passed in, which is what we're getting here!) */ wchar_t **argv_16 = CommandLineToArgvW(GetCommandLineW(), &argc); |