[Bf-blender-cvs] [fd1036e] viewport_experiments: Add new shader files to Scons
Antony Riakiotakis
noreply at git.blender.org
Tue Jan 6 15:50:08 CET 2015
Commit: fd1036e80325234d441ecfd90a10e78d49e61547
Author: Antony Riakiotakis
Date: Tue Jan 6 15:19:14 2015 +0100
Branches: viewport_experiments
https://developer.blender.org/rBfd1036e80325234d441ecfd90a10e78d49e61547
Add new shader files to Scons
===================================================================
M SConstruct
M source/blender/gpu/SConscript
===================================================================
diff --git a/SConstruct b/SConstruct
index 3ed8592..0cd2dfa 100644
--- a/SConstruct
+++ b/SConstruct
@@ -764,6 +764,8 @@ if B.targets != ['cudakernels']:
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fx_ssao_frag.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fx_dof_frag.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl")
+ data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fx_dof_high_frag.glsl")
+ data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fx_dof_high_vert.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fx_lib.glsl")
data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fx_vert.glsl")
data_to_c_simple("intern/opencolorio/gpu_shader_display_transform.glsl")
diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript
index 158cfb6..cc46ad6 100644
--- a/source/blender/gpu/SConscript
+++ b/source/blender/gpu/SConscript
@@ -68,6 +68,8 @@ sources.extend((
os.path.join(env['DATA_SOURCES'], "gpu_shader_fx_ssao_frag.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_dof_high_frag.glsl.c"),
+ os.path.join(env['DATA_SOURCES'], "gpu_shader_fx_dof_high_vert.glsl.c"),
os.path.join(env['DATA_SOURCES'], "gpu_shader_fx_lib.glsl.c"),
os.path.join(env['DATA_SOURCES'], "gpu_shader_fx_vert.glsl.c"),
os.path.join(env['DATA_SOURCES'], "gpu_shader_material.glsl.c"),
More information about the Bf-blender-cvs
mailing list