diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-09-05 18:33:36 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-09-05 18:33:36 +0400 |
| commit | 330aa94ecc0a674c7c2e8c34909c7b8ee9753c31 (patch) | |
| tree | 0b4bb82c771d34f85fad19013f3c44f4dad6a1fe /source/blender/gpu/GPU_material.h | |
| parent | 5b6e9eec7b907dcd06b81a199c132cac30ed1a6e (diff) | |
* GLSL lamps now respect 3d viewport layers.
* Fix undo crash related to sound. Sounds still stop working in
the game engine after undo, but seems to be a different issue.
Diffstat (limited to 'source/blender/gpu/GPU_material.h')
| -rw-r--r-- | source/blender/gpu/GPU_material.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index 560421f7edf..ccc687858f4 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -124,7 +124,7 @@ void GPU_material_free(struct Material *ma); void GPU_materials_free(); -void GPU_material_bind(GPUMaterial *material, int lay, double time); +void GPU_material_bind(GPUMaterial *material, int oblay, int viewlay, double time); void GPU_material_bind_uniforms(GPUMaterial *material, float obmat[][4], float viewmat[][4], float viewinv[][4], float obcol[4]); void GPU_material_unbind(GPUMaterial *material); int GPU_material_bound(GPUMaterial *material); @@ -158,7 +158,7 @@ int GPU_lamp_has_shadow_buffer(GPULamp *lamp); void GPU_lamp_shadow_buffer_bind(GPULamp *lamp, float viewmat[][4], int *winsize, float winmat[][4]); void GPU_lamp_shadow_buffer_unbind(GPULamp *lamp); -void GPU_lamp_update(GPULamp *lamp, float obmat[][4]); +void GPU_lamp_update(GPULamp *lamp, int lay, float obmat[][4]); int GPU_lamp_shadow_layer(GPULamp *lamp); #ifdef __cplusplus |