archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fix for more disable python defines,

Browse Source 
FTOCHAR didnt have brackets around the value. FTOCHAR(a+b) didnt work, FTOCHAR((a+b)) did.
This commit is contained in:
Campbell Barton
2008-10-29 16:49:51 +00:00
parent 481831bd27
commit 22bcbc5742
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_utildefines.h
View File

@@ -102,7 +102,7 @@
#define AVG2(x, y) ( 0.5 * ((x) + (y)) ) #define AVG2(x, y) ( 0.5 * ((x) + (y)) )
#define FTOCHAR(val) (val<=0.0f)? 0 : ((val>(1.0f-0.5f/255.0f))? 255 : (char)((255.0f*val)+0.5f)) #define FTOCHAR(val) ((val)<=0.0f)? 0 : (((val)>(1.0f-0.5f/255.0f))? 255 : (char)((255.0f*(val))+0.5f))
#define VECCOPY(v1,v2) {*(v1)= *(v2); *(v1+1)= *(v2+1); *(v1+2)= *(v2+2);} #define VECCOPY(v1,v2) {*(v1)= *(v2); *(v1+1)= *(v2+1); *(v1+2)= *(v2+2);}
#define VECCOPY2D(v1,v2) {*(v1)= *(v2); *(v1+1)= *(v2+1);} #define VECCOPY2D(v1,v2) {*(v1)= *(v2); *(v1+1)= *(v2+1);}

9
source/blender/blenkernel/SConscript
View File

@@ -4,7 +4,7 @@ Import ('env')
sources = env.Glob('intern/*.c') sources = env.Glob('intern/*.c')
incs = '. #/intern/guardedalloc ../include ../blenlib ../makesdna' incs = '. #/intern/guardedalloc ../include ../blenlib ../makesdna'
incs += ' ../python ../render/extern/include #/intern/decimation/extern' incs += ' ../render/extern/include #/intern/decimation/extern'
incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes' incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes'
incs += ' #/intern/iksolver/extern ../blenloader ../quicktime' incs += ' #/intern/iksolver/extern ../blenloader ../quicktime'
incs += ' #/extern/bullet2/src' incs += ' #/extern/bullet2/src'
@@ -12,7 +12,6 @@ incs += ' #/intern/bmfont'
incs += ' #/intern/opennl/extern' incs += ' #/intern/opennl/extern'
incs += ' ../gpu #/extern/glew/include' incs += ' ../gpu #/extern/glew/include'
incs += ' ' + env['BF_PYTHON_INC']
incs += ' ' + env['BF_OPENGL_INC'] incs += ' ' + env['BF_OPENGL_INC']
incs += ' ' + env['BF_ZLIB_INC'] incs += ' ' + env['BF_ZLIB_INC']
incs += ' ' + env['BF_SDL_INC'] incs += ' ' + env['BF_SDL_INC']
@@ -21,6 +20,9 @@ defs = ''
if not env['WITH_BF_PYTHON']: if not env['WITH_BF_PYTHON']:
defs += 'DISABLE_PYTHON' defs += 'DISABLE_PYTHON'
else:
incs += ' ../python'
incs += ' ' + env['BF_PYTHON_INC']
if env['WITH_BF_INTERNATIONAL']: if env['WITH_BF_INTERNATIONAL']:
defs += ' WITH_FREETYPE2' defs += ' WITH_FREETYPE2'
@@ -52,7 +54,4 @@ if env['BF_NO_ELBEEM']:
if env['WITH_BF_PLAYER']: if env['WITH_BF_PLAYER']:
SConscript(['bad_level_call_stubs/SConscript']) SConscript(['bad_level_call_stubs/SConscript'])
if not env['WITH_BF_PYTHON']:
defs += ' DISABLE_PYTHON'
env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [65, 20] ) env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [65, 20] )

3
source/blender/blenkernel/intern/node.c
View File

@@ -27,7 +27,10 @@
* ***** END GPL LICENSE BLOCK ***** * ***** END GPL LICENSE BLOCK *****
*/ */
#ifndef DISABLE_PYTHON
#include <Python.h> #include <Python.h>
#endif
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

2
source/blender/blenkernel/intern/text.c
View File

@@ -47,7 +47,7 @@
#include "BKE_global.h" #include "BKE_global.h"
#include "BKE_main.h" #include "BKE_main.h"
#ifdef DISABLE_PYTHON #ifndef DISABLE_PYTHON
#include "BPY_extern.h" #include "BPY_extern.h"
#endif #endif