Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-06-16 19:32:18 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-16 19:32:18 +0400
commit4dacad06a94dae1165427a6664c67591415e9594 (patch)
tree6247c00cdc138cd686f3a984d2966b653d8ca201 /source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
parent392b3a78e2c3744a043c3f04bcc0f82df73ef40c (diff)
code cleanup: spelling 'multiplyer' --> 'multiplier'
Diffstat (limited to 'source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
index 7c9b0c75518..db51e27c460 100644
--- a/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
+++ b/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.cpp
@@ -61,7 +61,7 @@ void VariableSizeBokehBlurOperation::executePixel(float *color, int x, int y, Me
tempColor[2] = 0;
tempColor[3] = 0;
float tempSize[4];
- float overallmultiplyer[4] = {0.0f, 0.0f, 0.0f, 0.0f};
+ float multiplier_accum[4] = {0.0f, 0.0f, 0.0f, 0.0f};
int miny = y - maxBlur;
int maxy = y + maxBlur;
@@ -74,7 +74,7 @@ void VariableSizeBokehBlurOperation::executePixel(float *color, int x, int y, Me
tempColor[2] += readColor[2];
tempColor[3] += readColor[3];
add_v4_v4(tempColor, readColor);
- add_v3_fl(overallmultiplyer, 1.0f);
+ add_v3_fl(multiplier_accum, 1.0f);
for (int ny = miny; ny < maxy; ny += QualityStepHelper::getStep()) {
for (int nx = minx; nx < maxx; nx += QualityStepHelper::getStep()) {
@@ -93,16 +93,16 @@ void VariableSizeBokehBlurOperation::executePixel(float *color, int x, int y, Me
inputBokehProgram->read(bokeh, u, v, COM_PS_NEAREST, inputBuffers);
inputProgram->read(readColor, nx, ny, COM_PS_NEAREST, inputBuffers);
madd_v4_v4v4(tempColor, bokeh, readColor);
- add_v4_v4(overallmultiplyer, bokeh);
+ add_v4_v4(multiplier_accum, bokeh);
}
}
}
}
- color[0] = tempColor[0] * (1.0f / overallmultiplyer[0]);
- color[1] = tempColor[1] * (1.0f / overallmultiplyer[1]);
- color[2] = tempColor[2] * (1.0f / overallmultiplyer[2]);
- color[3] = tempColor[3] * (1.0f / overallmultiplyer[3]);
+ color[0] = tempColor[0] * (1.0f / multiplier_accum[0]);
+ color[1] = tempColor[1] * (1.0f / multiplier_accum[1]);
+ color[2] = tempColor[2] * (1.0f / multiplier_accum[2]);
+ color[3] = tempColor[3] * (1.0f / multiplier_accum[3]);
}
}