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/gpu | |
| 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/gpu')
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 429eaea9b43..f5898c8d0be 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -1363,7 +1363,7 @@ static void gpu_lamp_from_blender(Scene *scene, Object *ob, Object *par, Lamp *l lamp->col[1]= la->g*lamp->energy; lamp->col[2]= la->b*lamp->energy; - GPU_lamp_update(lamp, ob->lay, (ob->restrictflag & OB_RESTRICT_VIEW), ob->obmat); + GPU_lamp_update(lamp, ob->lay, (ob->restrictflag & OB_RESTRICT_RENDER), ob->obmat); lamp->spotsi= la->spotsize; if(lamp->mode & LA_HALO) |