[Bf-blender-cvs] [eaaeae4] master: Cleanup: spelling

[Campbell Barton]

Commit: eaaeae469968c5c78a5d7e6d202f1af00b382a79
Author: Campbell Barton
Date:   Thu Oct 23 10:38:14 2014 +0200
Branches: master
https://developer.blender.org/rBeaaeae469968c5c78a5d7e6d202f1af00b382a79

Cleanup: spelling

===================================================================

M	intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
M	intern/cycles/kernel/kernel_volume.h
M	source/blender/blenkernel/intern/writeffmpeg.c
M	source/blender/blenlib/intern/task.c
M	source/blender/compositor/operations/COM_CropOperation.cpp
M	source/blender/compositor/operations/COM_CropOperation.h
M	source/blender/modifiers/intern/MOD_meshdeform.c

===================================================================

diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
index d30835d..4ee99c7 100644
--- a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
+++ b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
@@ -170,7 +170,7 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename, AUD_DeviceSpecs specs,
 				AUD_THROW(AUD_ERROR_FFMPEG, codec_error);
 
 			if(codec->sample_fmts) {
-				// Check if the prefered sample format for this codec is supported.
+				// Check if the preferred sample format for this codec is supported.
 				const enum AVSampleFormat *p = codec->sample_fmts;
 				for(; *p != -1; p++) {
 					if(*p == m_stream->codec->sample_fmt)
diff --git a/intern/cycles/kernel/kernel_volume.h b/intern/cycles/kernel/kernel_volume.h
index 93cb4c1..ce20f20 100644
--- a/intern/cycles/kernel/kernel_volume.h
+++ b/intern/cycles/kernel/kernel_volume.h
@@ -958,7 +958,7 @@ ccl_device void kernel_volume_stack_init(KernelGlobals *kg,
                                          Ray *ray,
                                          VolumeStack *stack)
 {
-	/* NULL ray happens in the baker, does it need proper initializetion of
+	/* NULL ray happens in the baker, does it need proper initialization of
 	 * camera in volume?
 	 */
 	if(!kernel_data.cam.is_inside_volume || ray == NULL) {
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index ca21180..739db7b 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -696,7 +696,7 @@ static AVStream *alloc_audio_stream(RenderData *rd, int codec_id, AVFormatContex
 	}
 
 	if (codec->sample_fmts) {
-		/* check if the prefered sample format for this codec is supported.
+		/* check if the preferred sample format for this codec is supported.
 		 * this is because, depending on the version of libav, and with the whole ffmpeg/libav fork situation,
 		 * you have various implementations around. float samples in particular are not always supported.
 		 */
diff --git a/source/blender/blenlib/intern/task.c b/source/blender/blenlib/intern/task.c
index 3a49abc..07c67f0 100644
--- a/source/blender/blenlib/intern/task.c
+++ b/source/blender/blenlib/intern/task.c
@@ -496,7 +496,7 @@ void BLI_task_parallel_range_ex(
 
 	BLI_assert(start < stop);
 
-	/* If it's not enough data to be cranched, don't bother with tasks at all,
+	/* If it's not enough data to be crunched, don't bother with tasks at all,
 	 * do everything from the main thread.
 	 */
 	if (stop - start < range_threshold) {
@@ -518,7 +518,7 @@ void BLI_task_parallel_range_ex(
 
 	/* The idea here is to prevent creating task for each of the loop iterations
 	 * and instead have tasks which are evenly distributed across CPU cores and
-	 * pull next iter to be cranched using the queue.
+	 * pull next iter to be crunched using the queue.
 	 */
 	for (i = 0; i < 2 * BLI_task_scheduler_num_threads(task_scheduler); i++) {
 		BLI_task_pool_push(task_pool,
diff --git a/source/blender/compositor/operations/COM_CropOperation.cpp b/source/blender/compositor/operations/COM_CropOperation.cpp
index c514b57..9bcc6fb 100644
--- a/source/blender/compositor/operations/COM_CropOperation.cpp
+++ b/source/blender/compositor/operations/COM_CropOperation.cpp
@@ -109,9 +109,9 @@ bool CropImageOperation::determineDependingAreaOfInterest(rcti *input, ReadBuffe
 	return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
 }
 
-void CropImageOperation::determineResolution(unsigned int resolution[2], unsigned int preferedResolution[2])
+void CropImageOperation::determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2])
 {
-	NodeOperation::determineResolution(resolution, preferedResolution);
+	NodeOperation::determineResolution(resolution, preferredResolution);
 	updateArea();
 	resolution[0] = this->m_xmax - this->m_xmin;
 	resolution[1] = this->m_ymax - this->m_ymin;
diff --git a/source/blender/compositor/operations/COM_CropOperation.h b/source/blender/compositor/operations/COM_CropOperation.h
index 4890ede..0b396ca 100644
--- a/source/blender/compositor/operations/COM_CropOperation.h
+++ b/source/blender/compositor/operations/COM_CropOperation.h
@@ -56,7 +56,7 @@ private:
 public:
 	CropImageOperation();
 	bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
-	void determineResolution(unsigned int resolution[2], unsigned int preferedResolution[2]);
+	void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
 	void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
 
 };
diff --git a/source/blender/modifiers/intern/MOD_meshdeform.c b/source/blender/modifiers/intern/MOD_meshdeform.c
index c3cbc07..c509bf4 100644
--- a/source/blender/modifiers/intern/MOD_meshdeform.c
+++ b/source/blender/modifiers/intern/MOD_meshdeform.c
@@ -181,7 +181,7 @@ static float meshdeform_dynamic_bind(MeshDeformModifierData *mmd, float (*dco)[3
 			{
 				__m128 cageweight_r = _mm_set1_ps(cageweight);
 				/* This will load one extra element, this is ok because
-				 * we ignore that part of reigister anyway.
+				 * we ignore that part of register anyway.
 				 */
 				__m128 cageco_r = _mm_loadu_ps(cageco);
 				co = _mm_add_ps(co,
@@ -197,7 +197,7 @@ static float meshdeform_dynamic_bind(MeshDeformModifierData *mmd, float (*dco)[3
 	}
 
 #ifdef __SSE2__
-	copy_v3_v3(vec, (float*)&co);
+	copy_v3_v3(vec, (float *)&co);
 #else
 	copy_v3_v3(vec, co);
 #endif