diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-03-15 23:00:21 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-15 23:00:21 +0400 |
commit | 40bfce66169fd0e290c7b2acc5159162719ff102 (patch) | |
tree | 28bc4cc3b5464c5ce8ab0c14d6230cf4d0cbe2b1 /source/blender/gpu | |
parent | 87602a6d2aeb09b6642a51269885b6fe7dc44721 (diff) |
use bool for knife, also scons tab/space mix.
Diffstat (limited to 'source/blender/gpu')
-rw-r--r-- | source/blender/gpu/SConscript | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript index 4a012c18e5e..6e3722e403a 100644 --- a/source/blender/gpu/SConscript +++ b/source/blender/gpu/SConscript @@ -44,19 +44,19 @@ if env['WITH_BF_SMOKE']: defs.append('WITH_SMOKE') if env['WITH_BF_DDS']: - defs.append('WITH_DDS') + defs.append('WITH_DDS') # generated data files import os sources.extend(( - os.path.join(env['DATA_SOURCES'], "gpu_shader_simple_frag.glsl.c"), - os.path.join(env['DATA_SOURCES'], "gpu_shader_simple_vert.glsl.c"), - os.path.join(env['DATA_SOURCES'], "gpu_shader_material.glsl.c"), - os.path.join(env['DATA_SOURCES'], "gpu_shader_sep_gaussian_blur_frag.glsl.c"), - os.path.join(env['DATA_SOURCES'], "gpu_shader_sep_gaussian_blur_vert.glsl.c"), - os.path.join(env['DATA_SOURCES'], "gpu_shader_vertex.glsl.c"), - os.path.join(env['DATA_SOURCES'], "gpu_shader_vsm_store_frag.glsl.c"), - os.path.join(env['DATA_SOURCES'], "gpu_shader_vsm_store_vert.glsl.c"), - )) + os.path.join(env['DATA_SOURCES'], "gpu_shader_simple_frag.glsl.c"), + os.path.join(env['DATA_SOURCES'], "gpu_shader_simple_vert.glsl.c"), + os.path.join(env['DATA_SOURCES'], "gpu_shader_material.glsl.c"), + os.path.join(env['DATA_SOURCES'], "gpu_shader_sep_gaussian_blur_frag.glsl.c"), + os.path.join(env['DATA_SOURCES'], "gpu_shader_sep_gaussian_blur_vert.glsl.c"), + os.path.join(env['DATA_SOURCES'], "gpu_shader_vertex.glsl.c"), + os.path.join(env['DATA_SOURCES'], "gpu_shader_vsm_store_frag.glsl.c"), + os.path.join(env['DATA_SOURCES'], "gpu_shader_vsm_store_vert.glsl.c"), + )) env.BlenderLib ( 'bf_gpu', sources, Split(incs), defines = defs, libtype=['core','player'], priority=[160,110] ) |