griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

svn merge ^/trunk/blender -r48160:48162

Browse Source
This commit is contained in:
Campbell Barton
2012-06-21 12:46:33 +00:00
parent 27c10cdf32 a803ce42df
commit 6d9cd68256
4 changed files with 6 additions and 6 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->setFramenumber(context->getFramenumber());
operation->setSmooth((bool)(editorNode->custom1 & CMP_NODEFLAG_MASK_AA) != 0);
operation->setFeather((bool)(editorNode->custom1 & CMP_NODEFLAG_MASK_FEATHER) != 0);
operation->setFeather((bool)(editorNode->custom1 & CMP_NODEFLAG_MASK_NO_FEATHER) == 0);
graph->addOperation(operation);
}

4
source/blender/makesdna/DNA_node_types.h
View File

@@ -369,8 +369,8 @@ enum {
};
enum {
CMP_NODEFLAG_MASK_AA = (1 << 0),
CMP_NODEFLAG_MASK_FEATHER = (1 << 1)
CMP_NODEFLAG_MASK_AA = (1 << 0),
CMP_NODEFLAG_MASK_NO_FEATHER = (1 << 1)
};
typedef struct NodeFrame {

4
source/blender/makesrna/intern/rna_nodetree.c
View File

@@ -3131,8 +3131,8 @@ static void def_cmp_mask(StructRNA *srna)
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "use_feather", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "custom1", CMP_NODE_MASK_ELLIPSE);
RNA_def_property_ui_text(prop, "Feather", "Apply an anti-aliasing filter to the mask");
RNA_def_property_boolean_negative_sdna(prop, NULL, "custom1", CMP_NODEFLAG_MASK_NO_FEATHER);
RNA_def_property_ui_text(prop, "Feather", "Use feather information from the mask");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
}

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,
(node->custom1 & CMP_NODEFLAG_MASK_AA) != 0,
(node->custom1 & CMP_NODEFLAG_MASK_FEATHER) != 0);
(node->custom1 & CMP_NODEFLAG_MASK_NO_FEATHER) == 0);
if (node->custom1) {
PLX_antialias_buffer(res,sx,sy);