sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

SCons updates:

Browse Source 
* Removed debug print in ftfont.
* Added FreeType/FTGL support to the Linux build.
  NOTE: This feature is on by default, but depends on the pre-build libraries.
  So checkout the lib directory. The lib dir should be on the same level as
  the blender dir. (In case you didn't know).
This commit is contained in:
Michel Selten 2004-01-05 21:30:26 +00:00
parent cea53c6473
commit 906c75396a
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SConstruct
View File

@ -10,7 +10,7 @@ sdl_lenv = Environment ()
link_env = Environment ()
if sys.platform == 'linux2':
use_international = 'false'
use_international = 'true'
use_gameengine = 'false'
use_openal = 'false'
use_fmod = 'false'
@ -39,6 +39,14 @@ if sys.platform == 'linux2':
python_include = sysconfig.get_python_inc ()
python_libpath = sysconfig.get_python_lib (0, 1) + '/config'
python_lib = 'python%d.%d' % sys.version_info[0:2]
# International stuff
if (use_international == 'true'):
defines += ['INTERNATIONAL', 'FTGL_STATIC_LIBRARY', 'WITH_FREETYPE2']
platform_libpath += ['#../lib/linux-glibc2.2.5-i386/ftgl',
'#../lib/linux-glibc2.2.5-i386/freetype/lib']
platform_libs += ['ftgl', 'freetype']
extra_includes += ['#../lib/linux-glibc2.2.5-i386/ftgl/include',
'#../lib/linux-glibc2.2.5-i386/freetype/include']
elif sys.platform == 'darwin':
use_international = 'false'

2
source/blender/ftfont/SConscript
View File

@ -12,8 +12,6 @@ include_paths = ['.',
'../blenlib',
'../makesdna']
print defines
ftf_env = Environment()
ftf_env.Append(CPPPATH = extra_includes)
ftf_env.Append(CPPPATH = include_paths)

3
source/blender/renderconverter/intern/convertBlenderScene.c
View File

@ -2880,7 +2880,8 @@ static void check_non_flat_quads(void)
vlr1= RE_findOrAddVlak(R.totvlak++);
*vlr1= *vlr;
vlr1->flag |= R_FACE_SPLIT;
VECCOPY(vlr1->n, nor); /* why not flipnorm here?! */
if(flipnorm) VecMulf(nor, -1.0);
VECCOPY(vlr1->n, nor);
vlr1->v2= vlr->v3;
vlr1->v3= vlr->v4;
vlr->v4= vlr1->v4= 0;