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/makesrna | |
| 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/makesrna')
| -rw-r--r-- | source/blender/makesrna/SConscript | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/SConscript | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/makesrna/SConscript b/source/blender/makesrna/SConscript index 089fbe11307..e9f937cb939 100644 --- a/source/blender/makesrna/SConscript +++ b/source/blender/makesrna/SConscript @@ -59,7 +59,8 @@ incs = [ ] incs = ' '.join(incs) -defs = env['BF_GL_DEFINITIONS'] +defs = [] +defs += env['BF_GL_DEFINITIONS'] if env['WITH_BF_SMOKE']: defs.append('WITH_SMOKE') diff --git a/source/blender/makesrna/intern/SConscript b/source/blender/makesrna/intern/SConscript index 0a9f9eec08c..4cb2a584240 100644 --- a/source/blender/makesrna/intern/SConscript +++ b/source/blender/makesrna/intern/SConscript @@ -53,7 +53,8 @@ makesrna_tool = env.Clone() rna = env.Clone() makesrna_tool.Append(CCFLAGS = '-DBASE_HEADER="\\"source/blender/makesrna/\\"" ') -defs = env['BF_GL_DEFINITIONS'] +defs = [] +defs += env['BF_GL_DEFINITIONS'] incs = [ '#/intern/guardedalloc', |