From c566e408e42836c136d8818cbea93ce870be09ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20T=C3=B6nne?= Date: Tue, 19 Nov 2013 11:06:16 +0100 Subject: Cleanup: Renamed compositor executePixel functions and their 'read' wrappers in SocketReader. Distinguish the 3 different methods for acquiring pixel color values (executePixel, executePixelSampled, executePixelFiltered). This makes it easier to keep track of the different sampling methods (and works nicer with IDEs that do code parsing). Differential Revision: http://developer.blender.org/D7 --- .../blender/compositor/operations/COM_MultilayerImageOperation.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/compositor/operations/COM_MultilayerImageOperation.cpp') diff --git a/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp b/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp index e2a95b2e33b..84c1fdfb6f5 100644 --- a/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp +++ b/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp @@ -42,7 +42,7 @@ ImBuf *MultilayerBaseOperation::getImBuf() return NULL; } -void MultilayerColorOperation::executePixel(float output[4], float x, float y, PixelSampler sampler) +void MultilayerColorOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler) { int yi = y; int xi = x; @@ -70,7 +70,7 @@ void MultilayerColorOperation::executePixel(float output[4], float x, float y, P } } -void MultilayerValueOperation::executePixel(float output[4], float x, float y, PixelSampler sampler) +void MultilayerValueOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler) { int yi = y; int xi = x; @@ -83,7 +83,7 @@ void MultilayerValueOperation::executePixel(float output[4], float x, float y, P } } -void MultilayerVectorOperation::executePixel(float output[4], float x, float y, PixelSampler sampler) +void MultilayerVectorOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler) { int yi = y; int xi = x; -- cgit v1.2.3