Material viewport shading receives light from light sources on other layers when they have a texture assigned #42074

New Issue

Andrej Ivanis · 2014-10-04T19:39:22+02:00

Andrej Ivanis commented

2014-10-04 19:39:22 +02:00

System Information
10.9.5
MacBook Pro Retina, Mid 2012

Blender Version
Broken: 2.72 RC

Exact steps for others to reproduce the error
Open the file and you will see that light source is on layer 1 and object is on layer 2. Only layer 2 is active so the light source shouldn't influence the viewport, but it does. This happens only when light source has a texture assigned. light_bug.blend

**System Information** 10.9.5 MacBook Pro Retina, Mid 2012 **Blender Version** Broken: 2.72 RC **Exact steps for others to reproduce the error** Open the file and you will see that light source is on layer 1 and object is on layer 2. Only layer 2 is active so the light source shouldn't influence the viewport, but it does. This happens only when light source has a texture assigned. [light_bug.blend](https://archive.blender.org/developer/F114859/light_bug.blend)

Andrej Ivanis commented

2014-10-04 19:39:22 +02:00

Changed status to: 'Open'

Andrej Ivanis commented

2014-10-04 19:39:22 +02:00

Added subscriber: @aivanis

Bastien Montagne self-assigned this 2014-10-06 14:49:01 +02:00

Bastien Montagne commented

2014-10-06 17:13:56 +02:00

Added subscribers: @Sergey, @Psy-Fi

Bastien Montagne commented

2014-10-06 17:13:56 +02:00

This simple patch fixes it:

P153: #42074

diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index 81dcd9c..c613040 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -677,7 +677,9 @@ static void shade_light_textures(GPUMaterial *mat, GPULamp *lamp, GPUNodeLink **
 				GPU_image(mtex->tex->ima, &mtex->tex->iuser, false),
 				GPU_dynamic_uniform((float*)lamp->dynpersmat, GPU_DYNAMIC_LAMP_DYNPERSMAT, lamp->ob),
 				&tex_rgb);
-			texture_rgb_blend(mat, tex_rgb, *rgb, GPU_uniform(&one), GPU_uniform(&mtex->colfac), mtex->blendtype, rgb); 
+			texture_rgb_blend(mat, tex_rgb, *rgb,
+			                  GPU_dynamic_uniform((float*)&lamp->dynenergy, GPU_DYNAMIC_LAMP_DYNENERGY, lamp->ob),
+			                  GPU_uniform(&mtex->colfac), mtex->blendtype, rgb);
 		}
 	}
 }

Not really at ease with OGL, though, so Sergey or Antony, need your blessing here. :)

This simple patch fixes it: [P153: #42074](https://archive.blender.org/developer/P153.txt) ``` diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 81dcd9c..c613040 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -677,7 +677,9 @@ static void shade_light_textures(GPUMaterial *mat, GPULamp *lamp, GPUNodeLink ** GPU_image(mtex->tex->ima, &mtex->tex->iuser, false), GPU_dynamic_uniform((float*)lamp->dynpersmat, GPU_DYNAMIC_LAMP_DYNPERSMAT, lamp->ob), &tex_rgb); - texture_rgb_blend(mat, tex_rgb, *rgb, GPU_uniform(&one), GPU_uniform(&mtex->colfac), mtex->blendtype, rgb); + texture_rgb_blend(mat, tex_rgb, *rgb, + GPU_dynamic_uniform((float*)&lamp->dynenergy, GPU_DYNAMIC_LAMP_DYNENERGY, lamp->ob), + GPU_uniform(&mtex->colfac), mtex->blendtype, rgb); } } } ``` Not really at ease with OGL, though, so Sergey or Antony, need your blessing here. :)

Antonis Ryakiotakis commented

2014-10-07 10:25:09 +02:00

This is not so good, colors are already multiplied by the energy (lamp->dyncol is calculated form lamp->col which is premultiplied by the energy), so if we do that, we will get the multiplication twice. Solution is to do the multiplication after texture application in the shader.

Bastien Montagne was unassigned by Antonis Ryakiotakis

2014-10-07 10:48:39 +02:00

Antonis Ryakiotakis self-assigned this 2014-10-07 10:48:39 +02:00

Antonis Ryakiotakis commented

2014-10-07 10:48:39 +02:00

Added subscriber: @mont29