diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-01-27 18:34:27 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-01-27 18:34:40 +0300 |
| commit | 332cf291e4b8b104252f34383193aed2f4c814e0 (patch) | |
| tree | a2d683b361648b4f22017ac57ddee8e6423e20b7 /source/blender/nodes | |
| parent | 2d86f58e0f773207eb7a3ff8ccbd58b85263fbe3 (diff) | |
Fix T43250, lamp node did not use energy when used with nodes in blender
internal.
Similar to fix for T42074 we need to multiply with energy -after-
texture application.
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_lamp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_lamp.c b/source/blender/nodes/shader/nodes/node_shader_lamp.c index adf53ba9b52..3b000d49822 100644 --- a/source/blender/nodes/shader/nodes/node_shader_lamp.c +++ b/source/blender/nodes/shader/nodes/node_shader_lamp.c @@ -62,11 +62,11 @@ static int gpu_shader_lamp(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED( { if (node->id) { GPULamp *lamp = GPU_lamp_from_blender(GPU_material_scene(mat), (Object *)node->id, NULL); - GPUNodeLink *col, *lv, *dist, *visifac, *shadow; + GPUNodeLink *col, *lv, *dist, *visifac, *shadow, *energy; - visifac = GPU_lamp_get_data(mat, lamp, &col, &lv, &dist, &shadow); + visifac = GPU_lamp_get_data(mat, lamp, &col, &lv, &dist, &shadow, &energy); - return GPU_stack_link(mat, "lamp", in, out, col, lv, dist, shadow, visifac); + return GPU_stack_link(mat, "lamp", in, out, col, energy, lv, dist, shadow, visifac); } return 0; |