diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-02-10 21:48:29 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-02-10 21:48:29 +0300 |
| commit | 9d7ef684e3ad699bd8aeb3324cfae2c98871e5e3 (patch) | |
| tree | b48815add7db5c850bf82775d421bb2b1fb06c3e /source/blender | |
| parent | 98b4fa74cbd9af209c190da116c26d6971e0b90a (diff) | |
* remove redundant define.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/nodes/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c | 4 | ||||
| -rw-r--r-- | source/blender/python/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/python/api2_2x/Node.c | 2 | ||||
| -rw-r--r-- | source/blender/python/api2_2x/Node.h | 3 |
5 files changed, 2 insertions, 11 deletions
diff --git a/source/blender/nodes/SConscript b/source/blender/nodes/SConscript index cc7cde6fc26..8682f626b80 100644 --- a/source/blender/nodes/SConscript +++ b/source/blender/nodes/SConscript @@ -41,6 +41,6 @@ if env['WITH_BF_QUICKTIME'] == 1: 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] ) diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c b/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c index 9c15877e478..3b9ef5ceb55 100644 --- a/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c +++ b/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c @@ -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 @@ bNodeType node_dynamic_typeinfo = { /* id */ NULL }; -#endif /* USE_PYNODES */ - diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index f608787d66d..481fdcbe13e 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -20,8 +20,6 @@ if env['WITH_BF_QUICKTIME']==1: if env['WITH_BF_OPENEXR'] == 1: defs.append('WITH_OPENEXR') -defs.append('USE_PYNODES') - if env['WITH_BF_FFMPEG'] == 1: defs.append('WITH_FFMPEG') diff --git a/source/blender/python/api2_2x/Node.c b/source/blender/python/api2_2x/Node.c index 195b61a39ea..d336cfecde7 100644 --- a/source/blender/python/api2_2x/Node.c +++ b/source/blender/python/api2_2x/Node.c @@ -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 @@ BPy_ShadeInput *ShadeInput_CreatePyObject(ShadeInput *shi) return pyshi; } -#endif diff --git a/source/blender/python/api2_2x/Node.h b/source/blender/python/api2_2x/Node.h index ce42527342a..04b54f86872 100644 --- a/source/blender/python/api2_2x/Node.h +++ b/source/blender/python/api2_2x/Node.h @@ -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 @@ extern void Node_SetShi(BPy_Node *self, ShadeInput *shi); #define NODE_OUTPUTSTACK 1 #endif /* __NODE_H__*/ -#endif /* USE_PYNODES */ + |