[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55382] trunk/blender/source/blender: Node poll_instance callback is optional, check if it exists before executing.

[Lukas Toenne]

Revision: 55382
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55382
Author:   lukastoenne
Date:     2013-03-18 19:19:26 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
Node poll_instance callback is optional, check if it exists before executing.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/node_group.c
    trunk/blender/source/blender/nodes/intern/node_common.c

Modified: trunk/blender/source/blender/editors/space_node/node_group.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_group.c	2013-03-18 18:43:22 UTC (rev 55381)
+++ trunk/blender/source/blender/editors/space_node/node_group.c	2013-03-18 19:19:26 UTC (rev 55382)
@@ -662,7 +662,7 @@
 	/* check poll functions for selected nodes */
 	for (node = ntree->nodes.first; node; node = node->next) {
 		if (node_group_make_use_node(node, gnode)) {
-			if (!node->typeinfo->poll_instance(node, ngroup)) {
+			if (node->typeinfo->poll_instance && !node->typeinfo->poll_instance(node, ngroup)) {
 				BKE_reportf(reports, RPT_WARNING, "Can not add node '%s' in a group", node->name);
 				ok = false;
 				break;

Modified: trunk/blender/source/blender/nodes/intern/node_common.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/node_common.c	2013-03-18 18:43:22 UTC (rev 55381)
+++ trunk/blender/source/blender/nodes/intern/node_common.c	2013-03-18 19:19:26 UTC (rev 55382)
@@ -105,7 +105,7 @@
 		return 0;
 	
 	for (node=grouptree->nodes.first; node; node=node->next) {
-		if (!node->typeinfo->poll_instance(node, nodetree)) {
+		if (node->typeinfo->poll_instance && !node->typeinfo->poll_instance(node, nodetree)) {
 			valid = 0;
 			break;
 		}