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-12 22:36:49 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-12 22:36:49 +0400
commit16dededdf399b0fcb62f8e062d2877873ed52b34 (patch)
tree7565ba08d29f9db630217e35822c71288ee44cb6 /source/blender/compositor/operations/COM_MaskOperation.cpp
parentca6290228f63490b777d7862ce50f537e604ab75 (diff)
remove input socket of mask node, this wasnt used.
Diffstat (limited to 'source/blender/compositor/operations/COM_MaskOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_MaskOperation.cpp15
1 files changed, 3 insertions, 12 deletions
diff --git a/source/blender/compositor/operations/COM_MaskOperation.cpp b/source/blender/compositor/operations/COM_MaskOperation.cpp
index a7c1de323f1..35174349a63 100644
--- a/source/blender/compositor/operations/COM_MaskOperation.cpp
+++ b/source/blender/compositor/operations/COM_MaskOperation.cpp
@@ -36,8 +36,7 @@ extern "C" {
MaskOperation::MaskOperation(): NodeOperation()
{
- this->addInputSocket(COM_DT_COLOR);
- this->addOutputSocket(COM_DT_COLOR);
+ this->addOutputSocket(COM_DT_VALUE);
this->mask = NULL;
this->maskWidth = 0;
this->maskHeight = 0;
@@ -75,7 +74,7 @@ void *MaskOperation::initializeTileData(rcti *rect, MemoryBuffer **memoryBuffers
float *buffer;
buffer = (float *)MEM_callocN(sizeof(float) * width * height, "rasterized mask");
- BKE_mask_rasterize(mask, width, height, buffer, TRUE, TRUE);
+ BKE_mask_rasterize(mask, width, height, buffer, TRUE);
this->rasterizedMask = buffer;
}
@@ -105,20 +104,12 @@ void MaskOperation::determineResolution(unsigned int resolution[], unsigned int
void MaskOperation::executePixel(float *color, int x, int y, MemoryBuffer *inputBuffers[], void *data)
{
if (!data) {
- color[0] = 0;
- color[1] = 0;
- color[2] = 0;
- color[3] = 1.0f;
+ color[0] = 0.0f;
}
else {
float *buffer = (float*) data;
int index = (y * this->getWidth() + x);
color[0] = buffer[index];
- color[1] = buffer[index];
- color[2] = buffer[index];
- color[3] = 1.0f;
}
}
-
-