[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32474] branches/particles-2010/source/ blender/blenkernel/intern/node.c: Disabled context type checks for links when building the tree.

Lukas Toenne lukas.toenne at googlemail.com
Thu Oct 14 17:58:09 CEST 2010


Revision: 32474
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32474
Author:   lukastoenne
Date:     2010-10-14 17:58:09 +0200 (Thu, 14 Oct 2010)

Log Message:
-----------
Disabled context type checks for links when building the tree. While it would be nice to have at least a partial context check for validity, the check function can not distinguish between collection and singleton contexts at "build time", since contexts are only fully determined at execution time. In the end some feedback system in case of such mismatches and other errors during execution is required.

Modified Paths:
--------------
    branches/particles-2010/source/blender/blenkernel/intern/node.c

Modified: branches/particles-2010/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/particles-2010/source/blender/blenkernel/intern/node.c	2010-10-14 13:18:42 UTC (rev 32473)
+++ branches/particles-2010/source/blender/blenkernel/intern/node.c	2010-10-14 15:58:09 UTC (rev 32474)
@@ -1887,6 +1887,11 @@
 			else {
 				valid = tti->compatibleSocketTypes(link->fromsock->type, link->tosock->type);
 				
+				/* would be nice to have at least a partial context check,
+				 * but this can not distinguish collections from singletons.
+				 * (S->S or S->C would still be valid!)
+				 */
+				#if 0
 				if (valid) {
 					StructRNA *fromctx = link->fromsock->contexttype;
 					StructRNA *toctx = link->tosock->contexttype;
@@ -1894,6 +1899,7 @@
 							valid =0;
 					}
 				}
+				#endif
 			}
 			
 			if (valid)





More information about the Bf-blender-cvs mailing list