Commit: c6be3fe9972885b7a97d8f5722575d0e9a6d32fb Author: Thomas Dinges Date: Sun Dec 6 23:09:17 2015 +0100 Branches: master https://developer.blender.org/rBc6be3fe9972885b7a97d8f5722575d0e9a6d32fb
Fix Scons after GLSL changes. =================================================================== M SConstruct =================================================================== diff --git a/SConstruct b/SConstruct index 29f5392..a5efed5 100644 --- a/SConstruct +++ b/SConstruct @@ -797,8 +797,8 @@ if B.targets != ['cudakernels']: data_to_c_simple("source/blender/gpu/shaders/gpu_program_smoke_frag.glsl") data_to_c_simple("source/blender/gpu/shaders/gpu_program_smoke_color_frag.glsl") - data_to_c_simple("source/blender/gpu/shaders/gpu_shader_simple_frag.glsl") - data_to_c_simple("source/blender/gpu/shaders/gpu_shader_simple_vert.glsl") + data_to_c_simple("source/blender/gpu/shaders/gpu_shader_basic_frag.glsl") + data_to_c_simple("source/blender/gpu/shaders/gpu_shader_basic_vert.glsl") data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl") data_to_c_simple("source/blender/gpu/shaders/gpu_shader_material.glsl") data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl") _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs