diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-08-04 19:04:45 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-08-04 19:06:28 +0300 |
commit | dfc672f8bbb8633f014f393fe3de2e39ed77c8dd (patch) | |
tree | beabdee122abee131811cb0872fa4fc2a5a73cfd /source/blender/blenfont | |
parent | 1fc32249f5d8bf33634461f9d1421104e5cf0323 (diff) |
SCons: Fix for really nasty bug with polluting configuration environment
The issue was caused by the following construction:
def = env['SOMETHING']
defs.append('SOMETHING_MORE')
Since first assignment was actually referencing environment option it was totally
polluted hawing weird and wonderful side effects on all other areas of Blender.
Diffstat (limited to 'source/blender/blenfont')
-rw-r--r-- | source/blender/blenfont/SConscript | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenfont/SConscript b/source/blender/blenfont/SConscript index 61d2ca9b12d..fdb5f669597 100644 --- a/source/blender/blenfont/SConscript +++ b/source/blender/blenfont/SConscript @@ -48,7 +48,8 @@ incs = [ incs.extend(Split(env['BF_FREETYPE_INC'])) -defs = env['BF_GL_DEFINITIONS'] +defs = [] +defs += env['BF_GL_DEFINITIONS'] if sys.platform == 'win32' or env['OURPLATFORM'] == 'linuxcross': defs.append('_WIN32') |