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:
Diffstat (limited to 'source/blender/compositor/operations/COM_EllipseMaskOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_EllipseMaskOperation.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp b/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
index c3cbaaaf2fc..9ab21e2d5bd 100644
--- a/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_EllipseMaskOperation.cpp
@@ -44,7 +44,7 @@ void EllipseMaskOperation::initExecution()
this->m_aspectRatio = ((float)this->getWidth()) / this->getHeight();
}
-void EllipseMaskOperation::executePixel(float *color, float x, float y, PixelSampler sampler)
+void EllipseMaskOperation::executePixel(float output[4], float x, float y, PixelSampler sampler)
{
float inputMask[4];
float inputValue[4];
@@ -74,40 +74,40 @@ void EllipseMaskOperation::executePixel(float *color, float x, float y, PixelSam
switch (this->m_maskType) {
case CMP_NODE_MASKTYPE_ADD:
if (inside) {
- color[0] = max(inputMask[0], inputValue[0]);
+ output[0] = max(inputMask[0], inputValue[0]);
}
else {
- color[0] = inputMask[0];
+ output[0] = inputMask[0];
}
break;
case CMP_NODE_MASKTYPE_SUBTRACT:
if (inside) {
- color[0] = inputMask[0] - inputValue[0];
- CLAMP(color[0], 0, 1);
+ output[0] = inputMask[0] - inputValue[0];
+ CLAMP(output[0], 0, 1);
}
else {
- color[0] = inputMask[0];
+ output[0] = inputMask[0];
}
break;
case CMP_NODE_MASKTYPE_MULTIPLY:
if (inside) {
- color[0] = inputMask[0] * inputValue[0];
+ output[0] = inputMask[0] * inputValue[0];
}
else {
- color[0] = 0;
+ output[0] = 0;
}
break;
case CMP_NODE_MASKTYPE_NOT:
if (inside) {
if (inputMask[0] > 0.0f) {
- color[0] = 0;
+ output[0] = 0;
}
else {
- color[0] = inputValue[0];
+ output[0] = inputValue[0];
}
}
else {
- color[0] = inputMask[0];
+ output[0] = inputMask[0];
}
break;
}