From dfc672f8bbb8633f014f393fe3de2e39ed77c8dd Mon Sep 17 00:00:00 2001 From: Sergey Sharybin 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. --- intern/opencolorio/SConscript | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'intern/opencolorio') 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') -- cgit v1.2.3