From dfc672f8bbb8633f014f393fe3de2e39ed77c8dd Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Tue, 4 Aug 2015 18:04:45 +0200
Subject: 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.
---
 source/blender/editors/animation/SConscript       | 3 ++-
 source/blender/editors/armature/SConscript        | 3 ++-
 source/blender/editors/gpencil/SConscript         | 3 ++-
 source/blender/editors/interface/SConscript       | 3 ++-
 source/blender/editors/mask/SConscript            | 3 ++-
 source/blender/editors/mesh/SConscript            | 3 ++-
 source/blender/editors/physics/SConscript         | 3 ++-
 source/blender/editors/render/SConscript          | 3 ++-
 source/blender/editors/screen/SConscript          | 3 ++-
 source/blender/editors/sculpt_paint/SConscript    | 3 ++-
 source/blender/editors/space_action/SConscript    | 3 ++-
 source/blender/editors/space_buttons/SConscript   | 3 ++-
 source/blender/editors/space_clip/SConscript      | 3 ++-
 source/blender/editors/space_console/SConscript   | 3 ++-
 source/blender/editors/space_file/SConscript      | 3 ++-
 source/blender/editors/space_graph/SConscript     | 3 ++-
 source/blender/editors/space_image/SConscript     | 3 ++-
 source/blender/editors/space_info/SConscript      | 3 ++-
 source/blender/editors/space_logic/SConscript     | 3 ++-
 source/blender/editors/space_nla/SConscript       | 3 ++-
 source/blender/editors/space_node/SConscript      | 4 +++-
 source/blender/editors/space_outliner/SConscript  | 3 ++-
 source/blender/editors/space_script/SConscript    | 3 ++-
 source/blender/editors/space_sequencer/SConscript | 3 ++-
 source/blender/editors/space_text/SConscript      | 3 ++-
 source/blender/editors/space_time/SConscript      | 3 ++-
 source/blender/editors/space_view3d/SConscript    | 3 ++-
 source/blender/editors/transform/SConscript       | 3 ++-
 source/blender/editors/util/SConscript            | 3 ++-
 source/blender/editors/uvedit/SConscript          | 3 ++-
 30 files changed, 61 insertions(+), 30 deletions(-)

(limited to 'source/blender/editors')

diff --git a/source/blender/editors/animation/SConscript b/source/blender/editors/animation/SConscript
index ed4b794cbce..11eea4dc4f2 100644
--- a/source/blender/editors/animation/SConscript
+++ b/source/blender/editors/animation/SConscript
@@ -43,7 +43,8 @@ incs = [
     '../../windowmanager',
     ]
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
diff --git a/source/blender/editors/armature/SConscript b/source/blender/editors/armature/SConscript
index 97bc1a138b3..8249dc00c17 100644
--- a/source/blender/editors/armature/SConscript
+++ b/source/blender/editors/armature/SConscript
@@ -45,7 +45,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']
diff --git a/source/blender/editors/gpencil/SConscript b/source/blender/editors/gpencil/SConscript
index ab42bad52dc..8e2ac5dc61e 100644
--- a/source/blender/editors/gpencil/SConscript
+++ b/source/blender/editors/gpencil/SConscript
@@ -47,7 +47,8 @@ incs = [
     '../../windowmanager',
     ]
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript
index 5af8bba5a9f..7584fd8ad46 100644
--- a/source/blender/editors/interface/SConscript
+++ b/source/blender/editors/interface/SConscript
@@ -46,7 +46,8 @@ incs = [
     '../../windowmanager',
     ]
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'win64-mingw'):
     if env['WITH_BF_IME']:
diff --git a/source/blender/editors/mask/SConscript b/source/blender/editors/mask/SConscript
index bcbaaa34960..c4e6daaf5df 100644
--- a/source/blender/editors/mask/SConscript
+++ b/source/blender/editors/mask/SConscript
@@ -29,7 +29,8 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 incs = [
     '#/intern/guardedalloc',
diff --git a/source/blender/editors/mesh/SConscript b/source/blender/editors/mesh/SConscript
index 122a7501e58..8b41241cea1 100644
--- a/source/blender/editors/mesh/SConscript
+++ b/source/blender/editors/mesh/SConscript
@@ -29,7 +29,8 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 incs = [
     '#/intern/guardedalloc',
diff --git a/source/blender/editors/physics/SConscript b/source/blender/editors/physics/SConscript
index 983d1c4b4ba..98d6be6d0bc 100644
--- a/source/blender/editors/physics/SConscript
+++ b/source/blender/editors/physics/SConscript
@@ -46,7 +46,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']
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']
diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript
index f5442c7ea63..355e3065312 100644
--- a/source/blender/editors/screen/SConscript
+++ b/source/blender/editors/screen/SConscript
@@ -46,7 +46,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']
diff --git a/source/blender/editors/sculpt_paint/SConscript b/source/blender/editors/sculpt_paint/SConscript
index 233f562fcc7..ba20337548a 100644
--- a/source/blender/editors/sculpt_paint/SConscript
+++ b/source/blender/editors/sculpt_paint/SConscript
@@ -29,7 +29,8 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 incs = [
     '#/intern/guardedalloc',
diff --git a/source/blender/editors/space_action/SConscript b/source/blender/editors/space_action/SConscript
index 20f31dd6399..28572f64fb8 100644
--- a/source/blender/editors/space_action/SConscript
+++ b/source/blender/editors/space_action/SConscript
@@ -29,7 +29,8 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 incs = [
     '#/intern/guardedalloc',
diff --git a/source/blender/editors/space_buttons/SConscript b/source/blender/editors/space_buttons/SConscript
index 07fe17e302b..b9cba3139c2 100644
--- a/source/blender/editors/space_buttons/SConscript
+++ b/source/blender/editors/space_buttons/SConscript
@@ -47,7 +47,8 @@ incs = [
     ]
 incs = ' '.join(incs)
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
diff --git a/source/blender/editors/space_clip/SConscript b/source/blender/editors/space_clip/SConscript
index 8fec4ebf0fa..46ad04a1478 100644
--- a/source/blender/editors/space_clip/SConscript
+++ b/source/blender/editors/space_clip/SConscript
@@ -29,7 +29,8 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 incs = [
     '#/intern/guardedalloc',
diff --git a/source/blender/editors/space_console/SConscript b/source/blender/editors/space_console/SConscript
index 87d12fe34bd..f189cd3920a 100644
--- a/source/blender/editors/space_console/SConscript
+++ b/source/blender/editors/space_console/SConscript
@@ -29,7 +29,8 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 incs = [
     '../include',
diff --git a/source/blender/editors/space_file/SConscript b/source/blender/editors/space_file/SConscript
index 85c3e073922..b37cba15281 100644
--- a/source/blender/editors/space_file/SConscript
+++ b/source/blender/editors/space_file/SConscript
@@ -46,7 +46,8 @@ incs = [
     ]
 incs = ' '.join(incs)
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 if env['WITH_BF_OPENJPEG']:
     defs.append('WITH_OPENJPEG')
diff --git a/source/blender/editors/space_graph/SConscript b/source/blender/editors/space_graph/SConscript
index ac23e8ee4e7..216ce2de334 100644
--- a/source/blender/editors/space_graph/SConscript
+++ b/source/blender/editors/space_graph/SConscript
@@ -44,7 +44,8 @@ incs = [
     '../../windowmanager',
     ]
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 if env['WITH_BF_AUDASPACE']:
     defs += env['BF_AUDASPACE_DEF']
diff --git a/source/blender/editors/space_image/SConscript b/source/blender/editors/space_image/SConscript
index e983db431b4..43181b437f5 100644
--- a/source/blender/editors/space_image/SConscript
+++ b/source/blender/editors/space_image/SConscript
@@ -48,7 +48,8 @@ incs = [
     ]
 incs = ' '.join(incs)
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
diff --git a/source/blender/editors/space_info/SConscript b/source/blender/editors/space_info/SConscript
index 378940805da..c64e263179b 100644
--- a/source/blender/editors/space_info/SConscript
+++ b/source/blender/editors/space_info/SConscript
@@ -47,7 +47,8 @@ incs = [
     ]
 incs = ' '.join(incs)
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
diff --git a/source/blender/editors/space_logic/SConscript b/source/blender/editors/space_logic/SConscript
index 067073fab22..f22a716e502 100644
--- a/source/blender/editors/space_logic/SConscript
+++ b/source/blender/editors/space_logic/SConscript
@@ -46,7 +46,8 @@ incs = [
     ]
 incs = ' '.join(incs)
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 if env['WITH_BF_GAMEENGINE']:
     defs.append('WITH_GAMEENGINE')
diff --git a/source/blender/editors/space_nla/SConscript b/source/blender/editors/space_nla/SConscript
index 9e743d918b9..d37bb201b81 100644
--- a/source/blender/editors/space_nla/SConscript
+++ b/source/blender/editors/space_nla/SConscript
@@ -44,7 +44,8 @@ incs = [
     ]
 incs = ' '.join(incs)
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript
index 435a78f1b7e..a79fc8c18bd 100644
--- a/source/blender/editors/space_node/SConscript
+++ b/source/blender/editors/space_node/SConscript
@@ -1,3 +1,4 @@
+
 #!/usr/bin/env python
 #
 # ***** BEGIN GPL LICENSE BLOCK *****
@@ -48,7 +49,8 @@ incs = [
     ]
 incs = ' '.join(incs)
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 cf = []
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
diff --git a/source/blender/editors/space_outliner/SConscript b/source/blender/editors/space_outliner/SConscript
index cc02c9555a9..ae3e960124f 100644
--- a/source/blender/editors/space_outliner/SConscript
+++ b/source/blender/editors/space_outliner/SConscript
@@ -29,7 +29,8 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs == env['BF_GL_DEFINITIONS']
 
 incs = [
     '#/intern/guardedalloc',
diff --git a/source/blender/editors/space_script/SConscript b/source/blender/editors/space_script/SConscript
index e749780a4aa..c03a61ec197 100644
--- a/source/blender/editors/space_script/SConscript
+++ b/source/blender/editors/space_script/SConscript
@@ -44,7 +44,8 @@ incs = [
     '../../windowmanager',
     ]
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 if env['WITH_BF_PYTHON']:
     defs.append('WITH_PYTHON')
diff --git a/source/blender/editors/space_sequencer/SConscript b/source/blender/editors/space_sequencer/SConscript
index 8ec1cddce10..32a79feac76 100644
--- a/source/blender/editors/space_sequencer/SConscript
+++ b/source/blender/editors/space_sequencer/SConscript
@@ -44,7 +44,8 @@ incs = [
     '../../windowmanager',
     ]
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 if env['WITH_BF_AUDASPACE']:
     defs += env['BF_AUDASPACE_DEF']
diff --git a/source/blender/editors/space_text/SConscript b/source/blender/editors/space_text/SConscript
index 8ee9bd745dd..c3518f857b6 100644
--- a/source/blender/editors/space_text/SConscript
+++ b/source/blender/editors/space_text/SConscript
@@ -29,7 +29,8 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 incs = [
     '#/intern/guardedalloc',
diff --git a/source/blender/editors/space_time/SConscript b/source/blender/editors/space_time/SConscript
index 5a9e9a4cb42..86437b9c258 100644
--- a/source/blender/editors/space_time/SConscript
+++ b/source/blender/editors/space_time/SConscript
@@ -42,6 +42,7 @@ incs = [
     '../../windowmanager',
     ]
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 env.BlenderLib('bf_editors_space_time', sources, incs, defs, libtype=['core'], priority=[65])
diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript
index 78f24948070..2ec9aa7e4af 100644
--- a/source/blender/editors/space_view3d/SConscript
+++ b/source/blender/editors/space_view3d/SConscript
@@ -29,7 +29,8 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 incs = [
     '#/intern/guardedalloc',
diff --git a/source/blender/editors/transform/SConscript b/source/blender/editors/transform/SConscript
index 1a2e9ab074a..823e94bd0ae 100644
--- a/source/blender/editors/transform/SConscript
+++ b/source/blender/editors/transform/SConscript
@@ -45,7 +45,8 @@ incs = [
     '../../windowmanager',
     ]
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 if env['WITH_BF_INTERNATIONAL']:
     defs.append('WITH_INTERNATIONAL')
diff --git a/source/blender/editors/util/SConscript b/source/blender/editors/util/SConscript
index d695a848f4e..8162f955464 100644
--- a/source/blender/editors/util/SConscript
+++ b/source/blender/editors/util/SConscript
@@ -29,7 +29,8 @@ Import ('env')
 
 sources = env.Glob('*.c')
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 incs = [
     '#/intern/guardedalloc',
diff --git a/source/blender/editors/uvedit/SConscript b/source/blender/editors/uvedit/SConscript
index 7153d25188b..501240ca4de 100644
--- a/source/blender/editors/uvedit/SConscript
+++ b/source/blender/editors/uvedit/SConscript
@@ -27,7 +27,8 @@
 
 Import ('env')
 
-defs = env['BF_GL_DEFINITIONS']
+defs = []
+defs += env['BF_GL_DEFINITIONS']
 
 sources = env.Glob('*.c')
 
-- 
cgit v1.2.3