diff options
| author | Michel Selten <michel@mselten.demon.nl> | 2004-01-06 00:30:26 +0300 |
|---|---|---|
| committer | Michel Selten <michel@mselten.demon.nl> | 2004-01-06 00:30:26 +0300 |
| commit | 906c75396aa7cc4609b72b9706204c22b229b1fc (patch) | |
| tree | 9af59da6f1e03f3cdea8cba608a932f8b970edd1 /source/blender | |
| parent | cea53c647339775cd213d1e4db319dcdcaa82e77 (diff) | |
SCons updates:
* 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).
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/ftfont/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/renderconverter/intern/convertBlenderScene.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/ftfont/SConscript b/source/blender/ftfont/SConscript index ef359bebd46..d75b2abfc37 100644 --- a/source/blender/ftfont/SConscript +++ b/source/blender/ftfont/SConscript @@ -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) diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c index fdef6b906c2..0260e4697d9 100644 --- a/source/blender/renderconverter/intern/convertBlenderScene.c +++ b/source/blender/renderconverter/intern/convertBlenderScene.c @@ -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; |