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/gpu/GPU_material.h | |
| 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/gpu/GPU_material.h')
| -rw-r--r-- | source/blender/gpu/GPU_material.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/GPU_material.h b/source/blender/gpu/GPU_material.h index a65a123c768..eef07fdb783 100644 --- a/source/blender/gpu/GPU_material.h +++ b/source/blender/gpu/GPU_material.h @@ -270,7 +270,7 @@ void GPU_lamp_update_colors(GPULamp *lamp, float r, float g, float b, float ener void GPU_lamp_update_distance(GPULamp *lamp, float distance, float att1, float att2); void GPU_lamp_update_spot(GPULamp *lamp, float spotsize, float spotblend); int GPU_lamp_shadow_layer(GPULamp *lamp); -GPUNodeLink *GPU_lamp_get_data(GPUMaterial *mat, GPULamp *lamp, GPUNodeLink **col, GPUNodeLink **lv, GPUNodeLink **dist, GPUNodeLink **shadow); +GPUNodeLink *GPU_lamp_get_data(GPUMaterial *mat, GPULamp *lamp, GPUNodeLink **col, GPUNodeLink **lv, GPUNodeLink **dist, GPUNodeLink **shadow, GPUNodeLink **energy); #ifdef __cplusplus } |