Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: spelling

Browse Source
This commit is contained in:
Campbell Barton
2014-10-23 10:38:14 +02:00
parent 88fe896243
commit eaaeae4699
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
View File

@@ -170,7 +170,7 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename, AUD_DeviceSpecs specs,
AUD_THROW(AUD_ERROR_FFMPEG, codec_error); AUD_THROW(AUD_ERROR_FFMPEG, codec_error);
if(codec->sample_fmts) { 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; const enum AVSampleFormat *p = codec->sample_fmts;
for(; *p != -1; p++) { for(; *p != -1; p++) {
if(*p == m_stream->codec->sample_fmt) if(*p == m_stream->codec->sample_fmt)

2
intern/cycles/kernel/kernel_volume.h
View File

@@ -958,7 +958,7 @@ ccl_device void kernel_volume_stack_init(KernelGlobals *kg,
Ray *ray, Ray *ray,
VolumeStack *stack) 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? * camera in volume?
*/ */
if(!kernel_data.cam.is_inside_volume || ray == NULL) { if(!kernel_data.cam.is_inside_volume || ray == NULL) {

2
source/blender/blenkernel/intern/writeffmpeg.c
View File

@@ -696,7 +696,7 @@ static AVStream *alloc_audio_stream(RenderData *rd, int codec_id, AVFormatContex
} }
if (codec->sample_fmts) { 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, * 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. * you have various implementations around. float samples in particular are not always supported.
*/ */

4
source/blender/blenlib/intern/task.c
View File

@@ -496,7 +496,7 @@ void BLI_task_parallel_range_ex(
BLI_assert(start < stop); 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. * do everything from the main thread.
*/ */
if (stop - start < range_threshold) { 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 /* 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 * 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++) { for (i = 0; i < 2 * BLI_task_scheduler_num_threads(task_scheduler); i++) {
BLI_task_pool_push(task_pool, BLI_task_pool_push(task_pool,

4
source/blender/compositor/operations/COM_CropOperation.cpp
View File

@@ -109,9 +109,9 @@ bool CropImageOperation::determineDependingAreaOfInterest(rcti *input, ReadBuffe
return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output); 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(); updateArea();
resolution[0] = this->m_xmax - this->m_xmin; resolution[0] = this->m_xmax - this->m_xmin;
resolution[1] = this->m_ymax - this->m_ymin; resolution[1] = this->m_ymax - this->m_ymin;

2
source/blender/compositor/operations/COM_CropOperation.h
View File

@@ -56,7 +56,7 @@ private:
public: public:
CropImageOperation(); CropImageOperation();
bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); 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); void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
}; };

4
source/blender/modifiers/intern/MOD_meshdeform.c
View File

@@ -181,7 +181,7 @@ static float meshdeform_dynamic_bind(MeshDeformModifierData *mmd, float (*dco)[3
{ {
__m128 cageweight_r = _mm_set1_ps(cageweight); __m128 cageweight_r = _mm_set1_ps(cageweight);
/* This will load one extra element, this is ok because /* 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); __m128 cageco_r = _mm_loadu_ps(cageco);
co = _mm_add_ps(co, co = _mm_add_ps(co,
@@ -197,7 +197,7 @@ static float meshdeform_dynamic_bind(MeshDeformModifierData *mmd, float (*dco)[3
} }
#ifdef __SSE2__ #ifdef __SSE2__
copy_v3_v3(vec, (float*)&co); copy_v3_v3(vec, (float *)&co);
#else #else
copy_v3_v3(vec, co); copy_v3_v3(vec, co);
#endif #endif