From 332cf291e4b8b104252f34383193aed2f4c814e0 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Tue, 27 Jan 2015 16:34:27 +0100 Subject: 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. --- source/blender/nodes/shader/nodes/node_shader_lamp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/nodes') 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; -- cgit v1.2.3