diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-07-15 03:26:38 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-07-15 03:26:38 +0400 |
| commit | 95fbf8342319baa202269d6f2674e482888761c7 (patch) | |
| tree | 70fbb4fa91b2330bc33cbb57a6ef2a9fbfa67c08 /source/blender/src/drawobject.c | |
| parent | a1fea54c185527a13aad3c3e5da81786fae3e13d (diff) | |
Apricot: GLSL
=============
* Added options to disable lights, shaders, shadows, ramps,
nodes and textures other than col/alpha for GLSL, in the
Game menu.
* These have python access too to switch them in game, but
it doesn't work correct yet with display lists enabled.
* Fix issue with light lagging behind, debug stats drawing in
wrong color, and a number of other small fixes.
Diffstat (limited to 'source/blender/src/drawobject.c')
| -rw-r--r-- | source/blender/src/drawobject.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index 61b1e32a876..49005c32252 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -187,7 +187,7 @@ int set_gl_material_attribs(int nr, GPUVertexAttribs *attribs) Material *mat = gpumatbuf[nr]; if(mat) { - GPU_material_from_blender(mat); + GPU_material_from_blender(G.scene, mat); if(mat->gpumaterial) { GPU_material_vertex_attributes(mat->gpumaterial, attribs); |