diff options
author | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
---|---|---|
committer | Julian Eisel <eiseljulian@gmail.com> | 2015-10-21 18:30:35 +0300 |
commit | 0775680e4d05eda3c495a56dc0b6eafbe96dc586 (patch) | |
tree | 4f3286eef96dec6ababe43467ed2a4f50388b988 /source/blender/editors/space_node/SConscript | |
parent | 4ade467fc6adfc13ce9e21d7e50b366fce70ea5f (diff) | |
parent | 6bc007610263c879f6bb30b844ba9d9a0fb9433c (diff) |
Merge branch 'master' into UI-graphical-redesignUI-graphical-redesign
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/resources.c
Diffstat (limited to 'source/blender/editors/space_node/SConscript')
-rw-r--r-- | source/blender/editors/space_node/SConscript | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/space_node/SConscript b/source/blender/editors/space_node/SConscript index 435a78f1b7e..b559b61cf5a 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 ***** @@ -37,6 +38,7 @@ incs = [ '../../blenfont', '../../blenkernel', '../../blenlib', + '../../blentranslation', '../../compositor', '../../gpu', '../../imbuf', @@ -48,7 +50,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'): |