[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25686] trunk/blender/source/blender/ render/intern/source/rayshade.c: [#20450] Crash before creating a volumetric material.

[Campbell Barton]

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

Log Message:
-----------
[#20450] Crash before creating a volumetric material.
- volumetric material must be traceable

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

Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rayshade.c	2010-01-03 05:34:53 UTC (rev 25685)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c	2010-01-03 05:40:33 UTC (rev 25686)
@@ -192,9 +192,10 @@
 
 static int is_raytraceable_vlr(Render *re, VlakRen *vlr)
 {
-	if((re->flag & R_BAKE_TRACE) || (vlr->mat->mode & MA_TRACEBLE))
-	if(vlr->mat->material_type != MA_TYPE_WIRE)
-		return 1;
+	/* note: volumetric must be tracable, wire must not */
+	if((re->flag & R_BAKE_TRACE) || (vlr->mat->mode & MA_TRACEBLE) || (vlr->mat->material_type == MA_TYPE_VOLUME))
+		if(vlr->mat->material_type != MA_TYPE_WIRE)
+			return 1;
 	return 0;
 }