[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60545] trunk/blender/source/blender: Fix related to [#36926] 'scale' Node doesn't work properly.

[Bastien Montagne]

Revision: 60545
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60545
Author:   mont29
Date:     2013-10-04 12:11:10 +0000 (Fri, 04 Oct 2013)
Log Message:
-----------
Fix related to [#36926] 'scale' Node doesn't work properly.

Scene/Render "spaces" are actually absolute values, they do not use the input X/Y scale factors, hide them in this case.

Thanks to Lukas for review and improvement!

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_scale.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2013-10-04 10:48:24 UTC (rev 60544)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2013-10-04 12:11:10 UTC (rev 60545)
@@ -2847,6 +2847,15 @@
 	rna_Node_update(bmain, scene, ptr);
 }
 
+static void rna_CompositorNodeScale_update(Main *bmain, Scene *scene, PointerRNA *ptr)
+{
+	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+	bNode *node = (bNode *)ptr->data;
+
+	nodeUpdate(ntree, node);
+	rna_Node_update(bmain, scene, ptr);
+}
+
 #else
 
 static EnumPropertyItem prop_image_layer_items[] = {
@@ -4360,7 +4369,7 @@
 	RNA_def_property_enum_sdna(prop, NULL, "custom1");
 	RNA_def_property_enum_items(prop, space_items);
 	RNA_def_property_ui_text(prop, "Space", "Coordinate space to scale relative to");
-	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
+	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_CompositorNodeScale_update");
 
 	/* expose 2 flags as a enum of 3 items */
 	prop = RNA_def_property(srna, "frame_method", PROP_ENUM, PROP_NONE);

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_scale.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_scale.c	2013-10-04 10:48:24 UTC (rev 60544)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_scale.c	2013-10-04 12:11:10 UTC (rev 60545)
@@ -45,12 +45,31 @@
 	{   -1, 0, ""   }
 };
 
+static void node_composite_update_scale(bNodeTree *UNUSED(ntree), bNode *node)
+{
+	bNodeSocket *sock;
+	bool use_xy_scale = ELEM(node->custom1, CMP_SCALE_RELATIVE, CMP_SCALE_ABSOLUTE);
+
+	/* Only show X/Y scale factor inputs for modes using them! */
+	for (sock = node->inputs.first; sock; sock = sock->next) {
+		if (STREQ(sock->name, "X") || STREQ(sock->name, "Y")) {
+			if (use_xy_scale) {
+				sock->flag &= ~SOCK_UNAVAIL;
+			}
+			else {
+				sock->flag |= SOCK_UNAVAIL;
+			}
+		}
+	}
+}
+
 void register_node_type_cmp_scale(void)
 {
 	static bNodeType ntype;
 
 	cmp_node_type_base(&ntype, CMP_NODE_SCALE, "Scale", NODE_CLASS_DISTORT, 0);
 	node_type_socket_templates(&ntype, cmp_node_scale_in, cmp_node_scale_out);
+	node_type_update(&ntype, node_composite_update_scale, NULL);
 
 	nodeRegisterType(&ntype);
 }