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/gameengine/Rasterizer | |
| 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/gameengine/Rasterizer')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript | 3 | ||||
| -rw-r--r-- | source/gameengine/Rasterizer/SConscript | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript index 93905f733dc..ce520df2a21 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript @@ -3,7 +3,8 @@ Import ('env') sources = env.Glob('*.cpp') -defs = env['BF_GL_DEFINITIONS'] +defs = [] +defs += env['BF_GL_DEFINITIONS'] incs = [ '.', diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript index c0d725ad957..a643f46e39a 100644 --- a/source/gameengine/Rasterizer/SConscript +++ b/source/gameengine/Rasterizer/SConscript @@ -46,7 +46,8 @@ incs = [ '#source/blender/makesdna', ] -defs = env['BF_GL_DEFINITIONS'] +defs = [] +defs += env['BF_GL_DEFINITIONS'] if env['WITH_BF_PYTHON']: incs.extend(Split(env['BF_PYTHON_INC'])) |