[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13628] trunk/blender/source/blender: * remove redundant define.

[Nathan Letwory]

Revision: 13628
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13628
Author:   jesterking
Date:     2008-02-10 19:48:29 +0100 (Sun, 10 Feb 2008)

Log Message:
-----------
* remove redundant define.

Modified Paths:
--------------
    trunk/blender/source/blender/nodes/SConscript
    trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
    trunk/blender/source/blender/python/SConscript
    trunk/blender/source/blender/python/api2_2x/Node.c
    trunk/blender/source/blender/python/api2_2x/Node.h

Modified: trunk/blender/source/blender/nodes/SConscript
===================================================================
--- trunk/blender/source/blender/nodes/SConscript	2008-02-10 10:26:29 UTC (rev 13627)
+++ trunk/blender/source/blender/nodes/SConscript	2008-02-10 18:48:29 UTC (rev 13628)
@@ -41,6 +41,6 @@
     defs += ' WITH_QUICKTIME'
     incs += ' ' + env['BF_QUICKTIME_INC']
 
-defs += ' WITH_CCGSUBSURF USE_PYNODES '
+defs += ' WITH_CCGSUBSURF '
 
 env.BlenderLib ( libname = 'nodes', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [65, 20] )

Modified: trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c	2008-02-10 10:26:29 UTC (rev 13627)
+++ trunk/blender/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c	2008-02-10 18:48:29 UTC (rev 13628)
@@ -27,8 +27,6 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifdef USE_PYNODES /* note: won't work without patch */
-
 #include <Python.h>
 #include <eval.h>
 
@@ -627,5 +625,3 @@
 	/* id          */	NULL
 };
 
-#endif /* USE_PYNODES */
-

Modified: trunk/blender/source/blender/python/SConscript
===================================================================
--- trunk/blender/source/blender/python/SConscript	2008-02-10 10:26:29 UTC (rev 13627)
+++ trunk/blender/source/blender/python/SConscript	2008-02-10 18:48:29 UTC (rev 13628)
@@ -20,8 +20,6 @@
 if env['WITH_BF_OPENEXR'] == 1:
     defs.append('WITH_OPENEXR')
 
-defs.append('USE_PYNODES')
-
 if env['WITH_BF_FFMPEG'] == 1:
     defs.append('WITH_FFMPEG')
 

Modified: trunk/blender/source/blender/python/api2_2x/Node.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Node.c	2008-02-10 10:26:29 UTC (rev 13627)
+++ trunk/blender/source/blender/python/api2_2x/Node.c	2008-02-10 18:48:29 UTC (rev 13628)
@@ -30,7 +30,6 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
 */
 
-#ifdef USE_PYNODES /* note: won't work without patch */
 #include "Node.h"
 
 #include "BKE_global.h"
@@ -1259,5 +1258,4 @@
 
 	return pyshi;
 }
-#endif
 

Modified: trunk/blender/source/blender/python/api2_2x/Node.h
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Node.h	2008-02-10 10:26:29 UTC (rev 13627)
+++ trunk/blender/source/blender/python/api2_2x/Node.h	2008-02-10 18:48:29 UTC (rev 13628)
@@ -30,7 +30,6 @@
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
 */
 
-#ifdef USE_PYNODES /* note: won't work without patch */
 #ifndef __NODE_H__
 #define __NODE_H__
 
@@ -86,4 +85,4 @@
 #define NODE_OUTPUTSTACK	1
 
 #endif /* __NODE_H__*/
-#endif /* USE_PYNODES */
+