archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

SCons: Fix for really nasty bug with polluting configuration environment

Browse Source 
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.
This commit is contained in:
Sergey Sharybin
2015-08-04 18:04:45 +02:00
parent 1fc32249f5
commit dfc672f8bb
51 changed files with 108 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/python/SConscript
View File

@@ -62,7 +62,8 @@ sources = env.Glob('bmesh/*.c')
env.BlenderLib( libname = 'bf_python_bmesh', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core','player'], priority = [362,165])
# generic
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if is_debug:
defs.append('_DEBUG')
@@ -79,7 +80,8 @@ env.BlenderLib( libname = 'bf_python_mathutils', sources = Split(sources), inclu
# bpy
defs = env['BF_GL_DEFINITIONS']
defs = []
defs += env['BF_GL_DEFINITIONS']
if is_debug:
defs.append('_DEBUG')