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

svn merge ^/trunk/blender -r48158:48160

Browse Source
This commit is contained in:
Campbell Barton
2012-06-21 12:38:09 +00:00
parent 86f9f3e439 54156e2b82
commit 27c10cdf32
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/compositor/nodes/COM_MaskNode.cpp
View File

@@ -56,7 +56,7 @@ void MaskNode::convertToOperations(ExecutionSystem *graph, CompositorContext *co
operation->setMask(mask); operation->setMask(mask);
operation->setFramenumber(context->getFramenumber()); operation->setFramenumber(context->getFramenumber());
operation->setSmooth((bool)(editorNode->custom1 & CMP_NODEFLAG_MASK_AA) != 0); operation->setSmooth((bool)(editorNode->custom1 & CMP_NODEFLAG_MASK_AA) != 0);
operation->setFeather((bool)(editorNode->custom1 & CMP_NODE_MASK_FEATHER) != 0); operation->setFeather((bool)(editorNode->custom1 & CMP_NODEFLAG_MASK_FEATHER) != 0);
graph->addOperation(operation); graph->addOperation(operation);
} }

2
source/blender/nodes/composite/nodes/node_composite_mask.c
View File

@@ -72,7 +72,7 @@ static void exec(void *data, bNode *node, bNodeStack **UNUSED(in), bNodeStack **
BKE_mask_rasterize(mask, sx, sy, res, TRUE, BKE_mask_rasterize(mask, sx, sy, res, TRUE,
(node->custom1 & CMP_NODEFLAG_MASK_AA) != 0, (node->custom1 & CMP_NODEFLAG_MASK_AA) != 0,
(node->custom1 & CMP_NODE_MASK_FEATHER) != 0); (node->custom1 & CMP_NODEFLAG_MASK_FEATHER) != 0);
if (node->custom1) { if (node->custom1) {
PLX_antialias_buffer(res,sx,sy); PLX_antialias_buffer(res,sx,sy);