[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25681] trunk/blender/source/blender: [ #20455] Spotlight halo with deep buffers: render crashes

[Campbell Barton]

Revision: 25681
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25681
Author:   campbellbarton
Date:     2010-01-03 04:18:48 +0100 (Sun, 03 Jan 2010)

Log Message:
-----------
[#20455] Spotlight halo with deep buffers: render crashes

Modified Paths:
--------------
    trunk/blender/source/blender/makesdna/DNA_lamp_types.h
    trunk/blender/source/blender/render/intern/source/convertblender.c
    trunk/blender/source/blender/render/intern/source/shadeoutput.c

Modified: trunk/blender/source/blender/makesdna/DNA_lamp_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_lamp_types.h	2010-01-03 03:01:46 UTC (rev 25680)
+++ trunk/blender/source/blender/makesdna/DNA_lamp_types.h	2010-01-03 03:18:48 UTC (rev 25681)
@@ -136,7 +136,7 @@
 #define LA_SQUARE		128
 #define LA_TEXTURE		256
 #define LA_OSATEX		512
-#define LA_DEEP_SHADOW	1024
+/* #define LA_DEEP_SHADOW	1024 */ /* not used anywhere */
 #define LA_NO_DIFF		2048
 #define LA_NO_SPEC		4096
 #define LA_SHAD_RAY		8192

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2010-01-03 03:01:46 UTC (rev 25680)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2010-01-03 03:18:48 UTC (rev 25681)
@@ -3630,7 +3630,7 @@
 	}
 
 	/* set flag for spothalo en initvars */
-	if(la->type==LA_SPOT && (la->mode & LA_HALO)) {
+	if(la->type==LA_SPOT && (la->mode & LA_HALO) && (la->buftype != LA_SHADBUF_DEEP)) {
 		if(la->haint>0.0) {
 			re->flag |= R_LAMPHALO;
 

Modified: trunk/blender/source/blender/render/intern/source/shadeoutput.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/shadeoutput.c	2010-01-03 03:01:46 UTC (rev 25680)
+++ trunk/blender/source/blender/render/intern/source/shadeoutput.c	2010-01-03 03:18:48 UTC (rev 25681)
@@ -354,7 +354,7 @@
 		lar= go->lampren;
 		if(lar==NULL) continue;
 		
-		if(lar->type==LA_SPOT && (lar->mode & LA_HALO) && lar->haint>0) {
+		if(lar->type==LA_SPOT && (lar->mode & LA_HALO) && (lar->buftype != LA_SHADBUF_DEEP) && lar->haint>0) {
 			
 			if(lar->mode & LA_LAYER) 
 				if(shi->vlr && (lar->lay & shi->obi->lay)==0)