[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35577] branches/particles-2010/source/ blender: Removed stack_ptr from socket dna, this is not needed any more.

[Lukas Toenne]

Revision: 35577
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35577
Author:   lukastoenne
Date:     2011-03-16 16:31:47 +0000 (Wed, 16 Mar 2011)
Log Message:
-----------
Removed stack_ptr from socket dna, this is not needed any more.

Modified Paths:
--------------
    branches/particles-2010/source/blender/makesdna/DNA_node_types.h
    branches/particles-2010/source/blender/nodes/intern/node_exec.c

Modified: branches/particles-2010/source/blender/makesdna/DNA_node_types.h
===================================================================
--- branches/particles-2010/source/blender/makesdna/DNA_node_types.h	2011-03-16 15:56:59 UTC (rev 35576)
+++ branches/particles-2010/source/blender/makesdna/DNA_node_types.h	2011-03-16 16:31:47 UTC (rev 35577)
@@ -101,11 +101,6 @@
 	
 	float locx, locy;
 	
-	/* XXX only one of stack_ptr or stack_index is used (depending on stack_type).
-	 * could store the index in the pointer with SET_INT_IN_POINTER (a bit ugly).
-	 * (union won't work here, not supported by DNA)
-	 */
-	struct bNodeStack *stack_ptr;	/* constant input value */
 	short stack_index;				/* local stack index */
 	short pad1;
 	

Modified: branches/particles-2010/source/blender/nodes/intern/node_exec.c
===================================================================
--- branches/particles-2010/source/blender/nodes/intern/node_exec.c	2011-03-16 15:56:59 UTC (rev 35576)
+++ branches/particles-2010/source/blender/nodes/intern/node_exec.c	2011-03-16 16:31:47 UTC (rev 35577)
@@ -111,18 +111,15 @@
 {
 	if (sock->link && sock->link->fromsock) {
 		sock->stack_index = sock->link->fromsock->stack_index;
-		sock->stack_ptr = sock->link->fromsock->stack_ptr;
 	}
 	else {
 		sock->stack_index = -1;
-		sock->stack_ptr = &sock->ns;
 	}
 }
 
 static void init_output_index(bNodeSocket *sock, int *index)
 {
 	sock->stack_index = (*index)++;
-	sock->stack_ptr = NULL;
 }
 
 bNodeTreeExec *ntree_exec_begin(bNodeTree *ntree)