[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60099] trunk/blender/source/blender: change NODE_TREE_TYPES_BEGIN/END macros to include braces ( matches CTX_DATA_BEGIN/END)

[Campbell Barton]

Revision: 60099
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60099
Author:   campbellbarton
Date:     2013-09-13 08:45:20 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------
change NODE_TREE_TYPES_BEGIN/END macros to include braces (matches CTX_DATA_BEGIN/END)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_node.h
    trunk/blender/source/blender/blenkernel/intern/node.c
    trunk/blender/source/blender/editors/space_node/space_node.c
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c

Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h	2013-09-13 03:49:11 UTC (rev 60098)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h	2013-09-13 08:45:20 UTC (rev 60099)
@@ -337,7 +337,7 @@
 #define NODE_TREE_TYPES_END \
 	} \
 	BLI_ghashIterator_free(__node_tree_type_iter__); \
-}
+} (void)0
 
 void ntreeSetTypes(const struct bContext *C, struct bNodeTree *ntree);
 

Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c	2013-09-13 03:49:11 UTC (rev 60098)
+++ trunk/blender/source/blender/blenkernel/intern/node.c	2013-09-13 08:45:20 UTC (rev 60099)
@@ -3574,11 +3574,13 @@
 	}
 
 	if (nodetreetypes_hash) {
-		NODE_TREE_TYPES_BEGIN(nt)
+		NODE_TREE_TYPES_BEGIN (nt)
+		{
 			if (nt->ext.free) {
 				nt->ext.free(nt->ext.data);
 			}
-		NODE_TREE_TYPES_END
+		}
+		NODE_TREE_TYPES_END;
 
 		BLI_ghash_free(nodetreetypes_hash, NULL, ntree_free_type);
 		nodetreetypes_hash = NULL;

Modified: trunk/blender/source/blender/editors/space_node/space_node.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/space_node.c	2013-09-13 03:49:11 UTC (rev 60098)
+++ trunk/blender/source/blender/editors/space_node/space_node.c	2013-09-13 08:45:20 UTC (rev 60099)
@@ -307,10 +307,12 @@
 	snode->zoom = 1.0f;
 
 	/* select the first tree type for valid type */
-	NODE_TREE_TYPES_BEGIN(treetype)
+	NODE_TREE_TYPES_BEGIN (treetype)
+	{
 		strcpy(snode->tree_idname, treetype->idname);
 		break;
-	NODE_TREE_TYPES_END
+	}
+	NODE_TREE_TYPES_END;
 
 	/* header */
 	ar = MEM_callocN(sizeof(ARegion), "header for node");

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2013-09-13 03:49:11 UTC (rev 60098)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2013-09-13 08:45:20 UTC (rev 60099)
@@ -190,26 +190,30 @@
 int rna_node_tree_type_to_enum(bNodeTreeType *typeinfo)
 {
 	int i = 0, result = -1;
-	NODE_TREE_TYPES_BEGIN(nt)
+	NODE_TREE_TYPES_BEGIN (nt)
+	{
 		if (nt == typeinfo) {
 			result = i;
 			break;
 		}
 		++i;
-	NODE_TREE_TYPES_END
+	}
+	NODE_TREE_TYPES_END;
 	return result;
 }
 
 int rna_node_tree_idname_to_enum(const char *idname)
 {
 	int i = 0, result = -1;
-	NODE_TREE_TYPES_BEGIN(nt)
+	NODE_TREE_TYPES_BEGIN (nt)
+	{
 		if (STREQ(nt->idname, idname)) {
 			result = i;
 			break;
 		}
 		++i;
-	NODE_TREE_TYPES_END
+	}
+	NODE_TREE_TYPES_END;
 	return result;
 }
 
@@ -217,13 +221,15 @@
 {
 	int i = 0;
 	bNodeTreeType *result = NULL;
-	NODE_TREE_TYPES_BEGIN(nt)
+	NODE_TREE_TYPES_BEGIN (nt)
+	{
 		if (i == value) {
 			result = nt;
 			break;
 		}
 		++i;
-	NODE_TREE_TYPES_END
+	}
+	NODE_TREE_TYPES_END;
 	return result;
 }
 
@@ -233,7 +239,8 @@
 	EnumPropertyItem *item = NULL;
 	int totitem = 0, i = 0;
 	
-	NODE_TREE_TYPES_BEGIN(nt)
+	NODE_TREE_TYPES_BEGIN (nt)
+	{
 		if (poll && !poll(data, nt)) {
 			++i;
 			continue;
@@ -248,7 +255,8 @@
 		RNA_enum_item_add(&item, &totitem, &tmp);
 		
 		++i;
-	NODE_TREE_TYPES_END
+	}
+	NODE_TREE_TYPES_END;
 
 	RNA_enum_item_end(&item, &totitem);
 	*free = 1;