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 /intern | |
| 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 'intern')
| -rw-r--r-- | intern/ghost/SConscript | 3 | ||||
| -rw-r--r-- | intern/glew-mx/SConscript | 5 | ||||
| -rw-r--r-- | intern/opencolorio/SConscript | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 025559e11a4..78566210047 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -48,7 +48,8 @@ sources.remove('intern' + os.sep + 'GHOST_ContextWGL.cpp') pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_SystemPaths', 'GHOST_Window', 'GHOST_DropTarget', 'GHOST_NDOFManager', 'GHOST_Context'] -defs = env['BF_GL_DEFINITIONS'] +defs = [] +defs += env['BF_GL_DEFINITIONS'] if env['WITH_BF_GL_EGL']: defs.append('WITH_EGL') diff --git a/intern/glew-mx/SConscript b/intern/glew-mx/SConscript index 5c70958816c..546470d020c 100644 --- a/intern/glew-mx/SConscript +++ b/intern/glew-mx/SConscript @@ -5,9 +5,8 @@ import os Import('env') sources = ['intern/glew-mx.c'] - -defs = env['BF_GL_DEFINITIONS'] - +defs = [] +defs += env['BF_GL_DEFINITIONS'] incs = [ '.', env['BF_GLEW_INC'], diff --git a/intern/opencolorio/SConscript b/intern/opencolorio/SConscript index c2fb95a4d95..6be6a5ed90c 100644 --- a/intern/opencolorio/SConscript +++ b/intern/opencolorio/SConscript @@ -30,7 +30,9 @@ Import('env') sources = env.Glob('*.cc') incs = '. ../guardedalloc ../../source/blender/blenlib' -defs = env['BF_GL_DEFINITIONS'] +defs = [] + +defs += env['BF_GL_DEFINITIONS'] if env['WITH_BF_OCIO']: defs.append('WITH_OCIO') |