archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

style cleanup: braces, compositor

Browse Source
This commit is contained in:
Campbell Barton
2012-05-17 13:44:15 +00:00
parent fe0d1a3810
commit 979f6bab9c
108 changed files with 802 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/compositor/operations/COM_BoxMaskOperation.cpp
View File

@@ -68,7 +68,8 @@ void BoxMaskOperation::executePixel(float* color, float x, float y, PixelSampler
case CMP_NODE_MASKTYPE_ADD:
if (inside) {
color[0] = max(inputMask[0],inputValue[0]);
} else {
}
else {
color[0] = inputMask[0];
}
break;
@@ -76,14 +77,16 @@ void BoxMaskOperation::executePixel(float* color, float x, float y, PixelSampler
if (inside) {
color[0] = inputMask[0]-inputValue[0];
CLAMP(color[0], 0, 1);
} else {
}
else {
color[0] = inputMask[0];
}
break;
case CMP_NODE_MASKTYPE_MULTIPLY:
if (inside) {
color[0] = inputMask[0]*inputValue[0];
} else {
}
else {
color[0] = 0;
}
break;
@@ -91,10 +94,12 @@ void BoxMaskOperation::executePixel(float* color, float x, float y, PixelSampler
if (inside) {
if (inputMask[0]>0.0f) {
color[0] = 0;
} else {
}
else {
color[0] = inputValue[0];
}
} else {
}
else {
color[0] = inputMask[0];
}
break;