diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-30 14:44:00 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2010-07-30 14:44:00 +0400 |
commit | 3b9b4f76054e55465c3c0ddbaed3f09618860b58 (patch) | |
tree | 44afe2f1575043a86eb7430d5b265c0e98fecbdf /source/blender/editors/space_view3d/view3d_draw.c | |
parent | fdae90fb1fc8496ad90c0cf980c1799abab2c2fb (diff) |
Fix #23103:
* missing glsl update when changing color management setting
* disable glsl lamps only when disabling them for render
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_draw.c')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 8408152d23c..69375674d94 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1807,7 +1807,7 @@ static void gpu_render_lamp_update(Scene *scene, View3D *v3d, Object *ob, Object lamp = GPU_lamp_from_blender(scene, ob, par); if(lamp) { - GPU_lamp_update(lamp, ob->lay, (ob->restrictflag & OB_RESTRICT_VIEW), obmat); + GPU_lamp_update(lamp, ob->lay, (ob->restrictflag & OB_RESTRICT_RENDER), obmat); GPU_lamp_update_colors(lamp, la->r, la->g, la->b, la->energy); if((ob->lay & v3d->lay) && GPU_lamp_has_shadow_buffer(lamp)) { |