tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

rename blur `Reference` to `Variable Size`, improve tooltip

This commit is contained in:
Campbell Barton 2012-08-14 12:39:12 +00:00
parent 34ebdcacfc
commit 59fedc6b7c
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,7 +59,7 @@ void BlurNode::convertToOperations(ExecutionSystem *graph, CompositorContext *co
graph->addOperation(operationfgb);
addPreviewOperation(graph, operationfgb->getOutputSocket());
}
else if (editorNode->custom1 & CMP_NODEFLAG_BLUR_REFERENCE) {
else if (editorNode->custom1 & CMP_NODEFLAG_BLUR_VARIABLE_SIZE) {
MathAddOperation *clamp = new MathAddOperation();
SetValueOperation *zero = new SetValueOperation();
addLink(graph, zero->getOutputSocket(), clamp->getInputSocket(1));

4
source/blender/editors/space_node/drawnode.c
View File

@ -1520,11 +1520,11 @@ static void node_composit_buts_blur(uiLayout *layout, bContext *UNUSED(C), Point
col = uiLayoutColumn(layout, FALSE);
filter = RNA_enum_get(ptr, "filter_type");
reference = RNA_boolean_get(ptr, "use_reference");
reference = RNA_boolean_get(ptr, "use_variable_size");
uiItemR(col, ptr, "filter_type", 0, "", ICON_NONE);
if (filter != R_FILTER_FAST_GAUSS) {
uiItemR(col, ptr, "use_reference", 0, NULL, ICON_NONE);
uiItemR(col, ptr, "use_variable_size", 0, NULL, ICON_NONE);
if (!reference) {
uiItemR(col, ptr, "use_bokeh", 0, NULL, ICON_NONE);
}

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

@ -389,7 +389,7 @@ enum {
};
enum {
CMP_NODEFLAG_BLUR_REFERENCE = (1 << 0),
CMP_NODEFLAG_BLUR_VARIABLE_SIZE = (1 << 0)
};
typedef struct NodeFrame {
@ -399,8 +399,11 @@ typedef struct NodeFrame {
/* this one has been replaced with ImageUser, keep it for do_versions() */
typedef struct NodeImageAnim {
int frames, sfra, nr;
char cyclic, movie;
int frames DNA_DEPRECATED;
int sfra DNA_DEPRECATED;
int nr DNA_DEPRECATED;
char cyclic DNA_DEPRECATED;
char movie DNA_DEPRECATED;
short pad;
} NodeImageAnim;

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

@ -1723,9 +1723,9 @@ static void def_cmp_blur(StructRNA *srna)
{0, NULL, 0, NULL, NULL}
};
prop = RNA_def_property(srna, "use_reference", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "custom1", CMP_NODEFLAG_BLUR_REFERENCE);
RNA_def_property_ui_text(prop, "Reference", "Use size socket as a reference image");
prop = RNA_def_property(srna, "use_variable_size", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "custom1", CMP_NODEFLAG_BLUR_VARIABLE_SIZE);
RNA_def_property_ui_text(prop, "Variable Size", "Support variable blue per-pixel when using an image for size input");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
RNA_def_struct_sdna_from(srna, "NodeBlurData", "storage");