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/python/SConscript | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source/blender/python/SConscript') diff --git a/source/blender/python/SConscript b/source/blender/python/SConscript index 7c5156605fc..eeca09e02e5 100644 --- a/source/blender/python/SConscript +++ b/source/blender/python/SConscript @@ -62,7 +62,8 @@ sources = env.Glob('bmesh/*.c') env.BlenderLib( libname = 'bf_python_bmesh', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [362,165]) # generic -defs = env['BF_GL_DEFINITIONS'] +defs = [] +defs += env['BF_GL_DEFINITIONS'] if is_debug: defs.append('_DEBUG') @@ -79,7 +80,8 @@ env.BlenderLib( libname = 'bf_python_mathutils', sources = Split(sources), inclu # bpy -defs = env['BF_GL_DEFINITIONS'] +defs = [] +defs += env['BF_GL_DEFINITIONS'] if is_debug: defs.append('_DEBUG') -- cgit v1.2.3