diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-15 03:37:19 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-08-15 03:37:19 +0400 |
| commit | 43bb431548436b6b1699f795acd107de0f6b86a8 (patch) | |
| tree | f1ab16c6380b85d50fdf6bb978e5f117b0d5d118 /source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp | |
| parent | b8905ba0a6731d2aba6f3487be58b338f35df5f7 (diff) | |
| parent | b174610a8461348a82454f9050bc0dee7d9ce926 (diff) | |
Merge from trunk r49601-r49907
Diffstat (limited to 'source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp index 323a381c869..375f1bcf07c 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp +++ b/source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.cpp @@ -90,7 +90,7 @@ BLI_INLINE float finv_test(const float f, const bool test) return (LIKELY(test == false)) ? f : 1.0f - f; } -void GaussianAlphaYBlurOperation::executePixel(float *color, int x, int y, void *data) +void GaussianAlphaYBlurOperation::executePixel(float output[4], int x, int y, void *data) { const bool do_invert = this->m_do_subtract; MemoryBuffer *inputBuffer = (MemoryBuffer *)data; @@ -148,7 +148,7 @@ void GaussianAlphaYBlurOperation::executePixel(float *color, int x, int y, void /* blend between the max value and gauss blue - gives nice feather */ const float value_blur = alpha_accum / multiplier_accum; const float value_final = (value_max * distfacinv_max) + (value_blur * (1.0f - distfacinv_max)); - color[0] = finv_test(value_final, do_invert); + output[0] = finv_test(value_final, do_invert); } void GaussianAlphaYBlurOperation::deinitExecution() |