diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-03 04:02:45 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-07-03 04:02:45 +0400 |
| commit | 98a7ca61fa905792bd3fdfa6c29f44691c9582ac (patch) | |
| tree | 47455f2482f6eca0352c10c57482641eec6afb57 /source/blender/compositor/operations/COM_MixAddOperation.cpp | |
| parent | 4e39a854b4589cddff484649d95cce4c71d4e9f4 (diff) | |
| parent | 2ed69a95f499081aacc15c0295f3461c38430554 (diff) | |
Merged changes in the trunk up to revision 48505.
Diffstat (limited to 'source/blender/compositor/operations/COM_MixAddOperation.cpp')
| -rw-r--r-- | source/blender/compositor/operations/COM_MixAddOperation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/compositor/operations/COM_MixAddOperation.cpp b/source/blender/compositor/operations/COM_MixAddOperation.cpp index bd9538a5600..7f7315fb3ff 100644 --- a/source/blender/compositor/operations/COM_MixAddOperation.cpp +++ b/source/blender/compositor/operations/COM_MixAddOperation.cpp @@ -33,9 +33,9 @@ void MixAddOperation::executePixel(float *outputValue, float x, float y, PixelSa float inputColor2[4]; float inputValue[4]; - inputValueOperation->read(inputValue, x, y, sampler, inputBuffers); - inputColor1Operation->read(inputColor1, x, y, sampler, inputBuffers); - inputColor2Operation->read(inputColor2, x, y, sampler, inputBuffers); + this->m_inputValueOperation->read(inputValue, x, y, sampler, inputBuffers); + this->m_inputColor1Operation->read(inputColor1, x, y, sampler, inputBuffers); + this->m_inputColor2Operation->read(inputColor2, x, y, sampler, inputBuffers); float value = inputValue[0]; |