diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-08-14 16:39:12 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-08-14 16:39:12 +0400 |
commit | 59fedc6b7c315cbf95035d7add1cdb6384eb13e7 (patch) | |
tree | 1f52baade85919117d263f001c4d42a8b85bdcf4 | |
parent | 34ebdcacfc26b7c42aa6c0aa4c03bf8aee72abac (diff) |
rename blur `Reference` to `Variable Size`, improve tooltip
-rw-r--r-- | source/blender/compositor/nodes/COM_BlurNode.cpp | 2 | ||||
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_node_types.h | 9 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 6 |
4 files changed, 12 insertions, 9 deletions
diff --git a/source/blender/compositor/nodes/COM_BlurNode.cpp b/source/blender/compositor/nodes/COM_BlurNode.cpp index 059b01e2c05..93ef002c8d7 100644 --- a/source/blender/compositor/nodes/COM_BlurNode.cpp +++ b/source/blender/compositor/nodes/COM_BlurNode.cpp @@ -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)); diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index d489b6f97ed..c45b54550f3 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -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); } diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h index 3f439454a97..4ff344d94d1 100644 --- a/source/blender/makesdna/DNA_node_types.h +++ b/source/blender/makesdna/DNA_node_types.h @@ -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; diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index a0e15b48e23..19be68801ca 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -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"); |