[Bf-blender-cvs] [09ce3c1] master: Blender Internal: Tweak GLSL preview of the spot lamp to use shadow buffer also for ray shadows, to solve inconsistency with the sun lamp.

[IRIE Shinsuke]

Commit: 09ce3c18ee70cfc99e36351518095ea6b70a6837
Author: IRIE Shinsuke
Date:   Fri Jan 17 21:02:00 2014 +0900
https://developer.blender.org/rB09ce3c18ee70cfc99e36351518095ea6b70a6837

Blender Internal: Tweak GLSL preview of the spot lamp to use shadow buffer also for ray shadows, to solve inconsistency with the sun lamp.

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

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 3c4bfdf..a746ac6 100644
--- a/source/blender/gpu/intern/gpu_material.c
+++ b/source/blender/gpu/intern/gpu_material.c
@@ -1779,7 +1779,7 @@ GPULamp *GPU_lamp_from_blender(Scene *scene, Object *ob, Object *par)
 	la = ob->data;
 	gpu_lamp_from_blender(scene, ob, par, la, lamp);
 
-	if ((la->type==LA_SPOT && (la->mode & LA_SHAD_BUF)) || (la->type==LA_SUN && (la->mode & LA_SHAD_RAY))) {
+	if ((la->type==LA_SPOT && (la->mode & (LA_SHAD_BUF | LA_SHAD_RAY))) || (la->type==LA_SUN && (la->mode & LA_SHAD_RAY))) {
 		/* opengl */
 		lamp->fb = GPU_framebuffer_create();
 		if (!lamp->fb) {