[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36534] branches/particles-2010/source: Changed rna_nodetree. c slightly to avoid compiler problems with variables in code.

[Lukas Toenne]

Revision: 36534
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36534
Author:   lukastoenne
Date:     2011-05-07 12:43:42 +0000 (Sat, 07 May 2011)
Log Message:
-----------
Changed rna_nodetree.c slightly to avoid compiler problems with variables in code.

Modified Paths:
--------------
    branches/particles-2010/source/blender/blenloader/intern/readfile.c
    branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
    branches/particles-2010/source/creator/CMakeLists.txt

Modified: branches/particles-2010/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/particles-2010/source/blender/blenloader/intern/readfile.c	2011-05-07 11:49:25 UTC (rev 36533)
+++ branches/particles-2010/source/blender/blenloader/intern/readfile.c	2011-05-07 12:43:42 UTC (rev 36534)
@@ -139,11 +139,6 @@
 #include "BLO_undofile.h"
 #include "BLO_readblenfile.h" // streaming read pipe, for BLO_readblenfile BLO_readblenfilememory
 
-#include "RNA_access.h"
-#include "RNA_types.h"
-
-#include "intern/node_socket.h"
-
 #include "readfile.h"
 
 #include "PIL_time.h"

Modified: branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c	2011-05-07 11:49:25 UTC (rev 36533)
+++ branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c	2011-05-07 12:43:42 UTC (rev 36534)
@@ -2676,11 +2676,7 @@
 {
 	StructRNA *srna;
 	PropertyRNA *prop=NULL;
-	
 	PropertySubType propsubtype= PROP_NONE;
-	#define SUBTYPE(socktype, stypename, id, idname)	if (subtype==SOCK_SUBTYPE_##id)	propsubtype = PROP_##id;
-	NODE_DEFINE_SUBTYPES
-	#undef SUBTYPE
 	
 	#define SUBTYPE(socktype, stypename, id, idname)	{ SOCK_SUBTYPE_##id, #id, 0, #idname, ""},
 	static EnumPropertyItem subtype_items[] = {
@@ -2688,6 +2684,10 @@
 		{0, NULL, 0, NULL, NULL}
 	};
 	#undef SUBTYPE
+
+	#define SUBTYPE(socktype, stypename, id, idname)	if (subtype==SOCK_SUBTYPE_##id)	propsubtype = PROP_##id;
+	NODE_DEFINE_SUBTYPES
+	#undef SUBTYPE
 	
 	srna = RNA_def_struct(brna, name, "NodeSocket");
 	RNA_def_struct_ui_text(srna, ui_name, "Input or output socket of a node");

Modified: branches/particles-2010/source/creator/CMakeLists.txt
===================================================================
--- branches/particles-2010/source/creator/CMakeLists.txt	2011-05-07 11:49:25 UTC (rev 36533)
+++ branches/particles-2010/source/creator/CMakeLists.txt	2011-05-07 12:43:42 UTC (rev 36534)
@@ -42,7 +42,6 @@
 	../blender/makesdna
 	../blender/gpu
 	../blender/windowmanager
-	/usr/local/cuda/include
 )
 
 if(WITH_CODEC_QUICKTIME)