[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32864] trunk/blender/source/blender/ render/intern/source/strand.c: Fix #24523: deep shadows are rendered although object's shadow casting is disabled.

[Brecht Van Lommel]

Revision: 32864
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32864
Author:   blendix
Date:     2010-11-04 12:41:05 +0100 (Thu, 04 Nov 2010)

Log Message:
-----------
Fix #24523: deep shadows are rendered although object's shadow casting is disabled.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/strand.c

Modified: trunk/blender/source/blender/render/intern/source/strand.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/strand.c	2010-11-03 23:49:56 UTC (rev 32863)
+++ trunk/blender/source/blender/render/intern/source/strand.c	2010-11-04 11:41:05 UTC (rev 32864)
@@ -825,6 +825,8 @@
 
 	/* for all object instances */
 	for(obi=re->instancetable.first, i=0; obi; obi=obi->next, i++) {
+		Material *ma;
+
 		obr= obi->obr;
 
 		if(!obr->strandbuf || !(obr->strandbuf->lay & lay))
@@ -836,6 +838,14 @@
 		else
 			copy_m4_m4(obwinmat, winmat);
 
+		/* test if we should skip it */
+		ma = obr->strandbuf->ma;
+
+		if(shadow && !(ma->mode & MA_SHADBUF))
+			continue;
+		else if(!shadow && (ma->mode & MA_ONLYCAST))
+			continue;
+
 		if(clip_render_object(obi->obr->boundbox, bounds, winmat))
 			continue;