Commit: 72bf5d13e6e65b055326e840d68f8fd9e237c1df
Author: Campbell Barton
Date: Mon Mar 21 16:01:26 2016 +1100
Branches: master
https://developer.blender.org/rB72bf5d13e6e65b055326e840d68f8fd9e237c1df
Fix for non spot lamps calculating spot values
Logical error in D1378, also incorrectly used lamp type as a flag.
===================================================================
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 c323268..2624bf2 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -2164,22 +2164,17 @@ static void gpu_lamp_calc_winmat(GPULamp *lamp)
wsize = lamp->la->shadow_frustum_size;
orthographic_m4(lamp->winmat, -wsize, wsize, -wsize, wsize,
lamp->d, lamp->clipend);
}
- else {
+ else if (lamp->type == LA_SPOT) {
angle = saacos(lamp->spotsi);
temp = 0.5f * lamp->size * cosf(angle) / sinf(angle);
pixsize = lamp->d / temp;
wsize = pixsize * 0.5f * lamp->size;
- if (lamp->type & LA_SPOT) {
- /* compute shadows according to X and Y scaling factors
*/
- perspective_m4(
- lamp->winmat,
- -wsize * lamp->spotvec[0], wsize *
lamp->spotvec[0],
- -wsize * lamp->spotvec[1], wsize *
lamp->spotvec[1],
- lamp->d, lamp->clipend);
- }
- else {
- perspective_m4(lamp->winmat, -wsize, wsize, -wsize,
wsize, lamp->d, lamp->clipend);
- }
+ /* compute shadows according to X and Y scaling factors */
+ perspective_m4(
+ lamp->winmat,
+ -wsize * lamp->spotvec[0], wsize * lamp->spotvec[0],
+ -wsize * lamp->spotvec[1], wsize * lamp->spotvec[1],
+ lamp->d, lamp->clipend);
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
