Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-03-10 19:38:23 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-03-10 19:38:23 +0400
commit9fe858264c698844c6734ed8eeeb0cd2373b4b4a (patch)
tree926c0f82915fe1417e3f679f5e64fe4f32350841 /source/blender/gpu/SConscript
parentf57398568a326dcbc69900d2c21b96abca14429b (diff)
OpenGL: more work on fixed function lighting implementation as GLSL.
* Rename functions and move to own header. * Add wrapper functions for glLight. * Auto detect if we can use faster code for solid lighting. * Various fixes for textured draw mode.
Diffstat (limited to 'source/blender/gpu/SConscript')
-rw-r--r--source/blender/gpu/SConscript4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/SConscript b/source/blender/gpu/SConscript
index ccea40c0909..4a012c18e5e 100644
--- a/source/blender/gpu/SConscript
+++ b/source/blender/gpu/SConscript
@@ -49,8 +49,8 @@ if env['WITH_BF_DDS']:
# generated data files
import os
sources.extend((
- os.path.join(env['DATA_SOURCES'], "gpu_shader_fixed_fragment.glsl.c"),
- os.path.join(env['DATA_SOURCES'], "gpu_shader_fixed_vertex.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"),