[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35301] trunk/blender/source/blender/ makesrna/intern/rna_nodetree.c: Removed tests for existing node pointers in RNA function for new links.

Lukas Toenne lukas.toenne at googlemail.com
Wed Mar 2 15:13:05 CET 2011


Revision: 35301
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35301
Author:   lukastoenne
Date:     2011-03-02 14:13:05 +0000 (Wed, 02 Mar 2011)
Log Message:
-----------
Removed tests for existing node pointers in RNA function for new links. Group node sockets don't have any specific node they belong to, so no node pointers are found.

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

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2011-03-02 14:09:54 UTC (rev 35300)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2011-03-02 14:13:05 UTC (rev 35301)
@@ -601,18 +601,17 @@
 static bNodeLink *rna_NodeTree_link_new(bNodeTree *ntree, ReportList *reports, bNodeSocket *in, bNodeSocket *out)
 {
 	bNodeLink *ret;
-	bNode *fromnode, *tonode;
+	bNode *fromnode= NULL, *tonode= NULL;
+	int from_in_out, to_in_out;
 
-	if (!nodeFindNode(ntree, in, &fromnode, NULL, NULL)) {
-		BKE_reportf(reports, RPT_ERROR, "Unable to locate input socket's node in nodetree");
+	nodeFindNode(ntree, in, &fromnode, NULL, &from_in_out);
+	nodeFindNode(ntree, out, &tonode, NULL, &to_in_out);
+	
+	if (&from_in_out == &to_in_out) {
+		BKE_reportf(reports, RPT_ERROR, "Same input/output direction of sockets");
 		return NULL;
 	}
 
-	if (!nodeFindNode(ntree, out, &tonode, NULL, NULL)) {
-		BKE_reportf(reports, RPT_ERROR, "Unable to locate output socket's node in nodetree");
-		return NULL;
-	}
-
 	/* unlink node input socket */
 	nodeRemSocketLinks(ntree, out);
 




More information about the Bf-blender-cvs mailing list