[Bf-blender-cvs] [7f10a889e3] master: Fix incorrect spot lamp blend in python GPU uniform export.

Michael Stahre noreply at git.blender.org
Thu Feb 2 04:28:34 CET 2017


Commit: 7f10a889e33cf5a8a524b4199911ec0d91d176f0
Author: Michael Stahre
Date:   Thu Feb 2 03:59:11 2017 +0100
Branches: master
https://developer.blender.org/rB7f10a889e33cf5a8a524b4199911ec0d91d176f0

Fix incorrect spot lamp blend in python GPU uniform export.

Reviewed By: brecht

Differential Revision: https://developer.blender.org/D2378

===================================================================

M	source/blender/gpu/intern/gpu_material.c

===================================================================

diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c
index b857aea29a..4e2043471b 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -609,7 +609,7 @@ static GPUNodeLink *lamp_get_visibility(GPUMaterial *mat, GPULamp *lamp, GPUNode
 			
 			GPU_link(mat, "lamp_visibility_spot",
 			         GPU_dynamic_uniform(&lamp->spotsi, GPU_DYNAMIC_LAMP_SPOTSIZE, lamp->ob),
-			         GPU_dynamic_uniform(&lamp->spotbl, GPU_DYNAMIC_LAMP_SPOTSIZE, lamp->ob),
+			         GPU_dynamic_uniform(&lamp->spotbl, GPU_DYNAMIC_LAMP_SPOTBLEND, lamp->ob),
 			         inpr, visifac, &visifac);
 		}




More information about the Bf-blender-cvs mailing list