Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-08-04 19:04:45 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-08-04 19:06:28 +0300
commitdfc672f8bbb8633f014f393fe3de2e39ed77c8dd (patch)
treebeabdee122abee131811cb0872fa4fc2a5a73cfd /source/blender/editors/render
parent1fc32249f5d8bf33634461f9d1421104e5cf0323 (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/editors/render')
-rw-r--r--source/blender/editors/render/SConscript3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/render/SConscript b/source/blender/editors/render/SConscript
index cbb7988695b..ada0c6cf251 100644
--- a/source/blender/editors/render/SConscript
+++ b/source/blender/editors/render/SConscript
@@ -49,7 +49,8 @@ incs = [
]
incs = ' '.join(incs)
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
incs += ' ' + env['BF_PTHREADS_INC']