[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49629] branches/soc-2011-tomato: Merging r49624 through r49628 from trunk into soc-2011-tomato

[Sergey Sharybin]

Revision: 49629
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49629
Author:   nazgul
Date:     2012-08-06 17:07:20 +0000 (Mon, 06 Aug 2012)
Log Message:
-----------
Merging r49624 through r49628 from trunk into soc-2011-tomato

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49624
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49628

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49623
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-49628


Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49623
   + /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-49628


Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49623
   + /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-49628

Modified: branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
===================================================================
--- branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c	2012-08-06 16:25:38 UTC (rev 49628)
+++ branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c	2012-08-06 17:07:20 UTC (rev 49629)
@@ -547,15 +547,6 @@
 
 /* **************** REROUTE ******************** */
 
-static bNodeSocketTemplate node_reroute_in[]= {
-	{	SOCK_RGBA, 1, "Input",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{	-1, 0, ""	}
-};
-static bNodeSocketTemplate node_reroute_out[]= {
-	{	SOCK_RGBA, 0, "Output",			0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
-	{	-1, 0, ""	}
-};
-
 /* simple, only a single input and output here */
 static ListBase node_reroute_internal_connect(bNodeTree *ntree, bNode *node)
 {
@@ -580,6 +571,15 @@
 	return ret;
 }
 
+static void node_reroute_init(bNodeTree *ntree, bNode* node, bNodeTemplate *UNUSED(ntemp))
+{
+	/* Note: Cannot use socket templates for this, since it would reset the socket type
+	 * on each file read via the template verification procedure.
+	 */
+	nodeAddSocket(ntree, node, SOCK_IN, "Input", SOCK_RGBA);
+	nodeAddSocket(ntree, node, SOCK_OUT, "Output", SOCK_RGBA);
+}
+
 static void node_reroute_update(bNodeTree *UNUSED(ntree), bNode *node)
 {
 	bNodeSocket *input = node->inputs.first;
@@ -603,7 +603,7 @@
 	bNodeType *ntype= MEM_callocN(sizeof(bNodeType), "frame node type");
 	
 	node_type_base(ttype, ntype, NODE_REROUTE, "Reroute", NODE_CLASS_LAYOUT, 0);
-	node_type_socket_templates(ntype, node_reroute_in, node_reroute_out);
+	node_type_init(ntype, node_reroute_init);
 	node_type_internal_connect(ntype, node_reroute_internal_connect);
 	node_type_update(ntype, node_reroute_update, NULL);