[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44573] trunk/blender/source/blender/nodes /composite/nodes/node_composite_outputFile.c: When adding a file output socket make it active, for convenience.

Lukas Toenne lukas.toenne at googlemail.com
Thu Mar 1 12:41:22 CET 2012


Revision: 44573
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44573
Author:   lukastoenne
Date:     2012-03-01 11:41:15 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
When adding a file output socket make it active, for convenience. Also move back one index when deleting the last.

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c

Modified: trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c
===================================================================
--- trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c	2012-03-01 11:19:41 UTC (rev 44572)
+++ trunk/blender/source/blender/nodes/composite/nodes/node_composite_outputFile.c	2012-03-01 11:41:15 UTC (rev 44573)
@@ -47,6 +47,7 @@
 
 bNodeSocket *ntreeCompositOutputFileAddSocket(bNodeTree *ntree, bNode *node, const char *name, ImageFormatData *im_format)
 {
+	NodeImageMultiFile *nimf = node->storage;
 	bNodeSocket *sock = nodeAddSocket(ntree, node, SOCK_IN, name, SOCK_RGBA);
 	
 	/* create format data for the input socket */
@@ -63,6 +64,8 @@
 	/* use node data format by default */
 	sockdata->use_node_format = 1;
 	
+	nimf->active_input = BLI_findindex(&node->inputs, sock);
+	
 	return sock;
 }
 
@@ -70,10 +73,14 @@
 {
 	NodeImageMultiFile *nimf = node->storage;
 	bNodeSocket *sock = BLI_findlink(&node->inputs, nimf->active_input);
+	int totinputs = BLI_countlist(&node->inputs);
 	
 	if (!sock)
 		return 0;
 	
+	if (nimf->active_input == totinputs-1)
+		--nimf->active_input;
+	
 	/* free format data */
 	MEM_freeN(sock->storage);
 	




More information about the Bf-blender-cvs mailing list