Committing patch #25675 "Make "Cast Buffer Shadows" option work in viewport and BGE" by me.

Description from the tracker:
"It's really handy to be able to prevent an object/material from casting a shadow. So, I made use of the Cast Buffer Shadows option in the material settings, and made it work in the viewport and the BGE."

2 files changed, 14 insertions, 2 deletions

diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index ddc10d78cac..3133ad131bb 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -2843,8 +2843,20 @@ static int draw_mesh_object(Scene *scene, ARegion *ar, View3D *v3d, RegionView3D
 	Object *ob= base->object;
 	Object *obedit= scene->obedit;
 	Mesh *me= ob->data;
+	Material *ma=NULL;
 	EditMesh *em= me->edit_mesh;
-	int do_alpha_pass= 0, drawlinked= 0, retval= 0, glsl, check_alpha;
+	int do_alpha_pass= 0, drawlinked= 0, retval= 0, glsl, check_alpha, i;
+
+	/* If we are drawing shadows and any of the materials don't cast a shadow, then don't draw the object */
+	if (v3d->flag2 & V3D_RENDER_SHADOW)
+	{
+		for(i=0; i<ob->totcol; ++i)
+		{
+			ma = give_current_material(ob, i);
+			if (ma && !(ma->mode & MA_SHADBUF))
+				return 1;
+		}
+	}
 	
 	if(obedit && ob!=obedit && ob->data==obedit->data) {
 		if(ob_get_key(ob) || ob_get_key(obedit));
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index f8837594ddb..9249d4d2bf0 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -2155,7 +2155,7 @@ static void gpu_update_lamps_shadows(Scene *scene, View3D *v3d)
 		v3d->drawtype = OB_SOLID;
 		v3d->lay &= GPU_lamp_shadow_layer(shadow->lamp);
 		v3d->flag2 &= ~V3D_SOLID_TEX;
-		v3d->flag2 |= V3D_RENDER_OVERRIDE;
+		v3d->flag2 |= V3D_RENDER_OVERRIDE | V3D_RENDER_SHADOW;
 		
 		GPU_lamp_shadow_buffer_bind(shadow->lamp, viewmat, &winsize, winmat);