[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49892] trunk/blender/source/blender: rename blur `Reference` to `Variable Size`, improve tooltip

[Campbell Barton]

Revision: 49892
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49892
Author:   campbellbarton
Date:     2012-08-14 12:39:12 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
rename blur `Reference` to `Variable Size`, improve tooltip

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp
    trunk/blender/source/blender/editors/space_node/drawnode.c
    trunk/blender/source/blender/makesdna/DNA_node_types.h
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c

Modified: trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp	2012-08-14 12:18:58 UTC (rev 49891)
+++ trunk/blender/source/blender/compositor/nodes/COM_BlurNode.cpp	2012-08-14 12:39:12 UTC (rev 49892)
@@ -59,7 +59,7 @@
 		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));

Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c	2012-08-14 12:18:58 UTC (rev 49891)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c	2012-08-14 12:39:12 UTC (rev 49892)
@@ -1520,11 +1520,11 @@
 	
 	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);
 		}

Modified: trunk/blender/source/blender/makesdna/DNA_node_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_node_types.h	2012-08-14 12:18:58 UTC (rev 49891)
+++ trunk/blender/source/blender/makesdna/DNA_node_types.h	2012-08-14 12:39:12 UTC (rev 49892)
@@ -389,7 +389,7 @@
 };
 
 enum {
-	CMP_NODEFLAG_BLUR_REFERENCE = (1 << 0),
+	CMP_NODEFLAG_BLUR_VARIABLE_SIZE = (1 << 0)
 };
 
 typedef struct NodeFrame {
@@ -399,8 +399,11 @@
 
 /* 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;
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2012-08-14 12:18:58 UTC (rev 49891)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2012-08-14 12:39:12 UTC (rev 49892)
@@ -1723,9 +1723,9 @@
 		{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");