From dfc672f8bbb8633f014f393fe3de2e39ed77c8dd Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 4 Aug 2015 18:04:45 +0200 Subject: 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. --- source/blender/blenfont/SConscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/blenfont') 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') -- cgit v1.2.3