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/python/SConscript | |
| 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/python/SConscript')
| -rw-r--r-- | source/blender/python/SConscript | 6 |
1 files changed, 4 insertions, 2 deletions
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') |