From 95fbf8342319baa202269d6f2674e482888761c7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 14 Jul 2008 23:26:38 +0000 Subject: 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. --- source/blender/src/drawobject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/src/drawobject.c') 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); -- cgit v1.2.3