diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
| commit | 080cf9332bc9d71e0e14326bc8efdf06b738dea1 (patch) | |
| tree | e8531a509dca4d8253aa19d89edc68152421f9e5 /source/blender/gpu/SConscript | |
| parent | 6d495cc4ef071171ff0686b2be898a41e05b8051 (diff) | |
| parent | 9676642cc94599b3419c9aaa5cf1aae2fbbd235f (diff) | |
Merge branch 'gooseberry' into temp_motionpathstemp_motionpaths
Conflicts:
source/blender/blenkernel/intern/object.c
Diffstat (limited to 'source/blender/gpu/SConscript')
| -rw-r--r-- | source/blender/gpu/SConscript | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript index f52b39dba3b..ff5fb42c021 100644 --- a/source/blender/gpu/SConscript +++ b/source/blender/gpu/SConscript @@ -63,9 +63,14 @@ if env['WITH_BF_DDS']: # generated data files import os sources.extend(( + os.path.join(env['DATA_SOURCES'], "gpu_program_smoke_frag.glsl.c"), + os.path.join(env['DATA_SOURCES'], "gpu_program_smoke_color_frag.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_fx_ssao_frag.glsl.c"), + os.path.join(env['DATA_SOURCES'], "gpu_shader_fx_dof_hq_frag.glsl.c"), + os.path.join(env['DATA_SOURCES'], "gpu_shader_fx_dof_hq_vert.glsl.c"), + os.path.join(env['DATA_SOURCES'], "gpu_shader_fx_dof_hq_geo.glsl.c"), os.path.join(env['DATA_SOURCES'], "gpu_shader_fx_dof_frag.glsl.c"), os.path.join(env['DATA_SOURCES'], "gpu_shader_fx_dof_vert.glsl.c"), os.path.join(env['DATA_SOURCES'], "gpu_shader_fx_depth_resolve.glsl.c"), |