[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30632] trunk/blender/source/blender/ render/intern/source: Fix [#22946] Camera inside volume gives bad results

[Matt Ebb]

Revision: 30632
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30632
Author:   broken
Date:     2010-07-22 14:30:17 +0200 (Thu, 22 Jul 2010)

Log Message:
-----------
Fix [#22946] Camera inside volume gives bad results 

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

Modified: trunk/blender/source/blender/render/intern/source/shadeinput.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/shadeinput.c	2010-07-22 12:02:39 UTC (rev 30631)
+++ trunk/blender/source/blender/render/intern/source/shadeinput.c	2010-07-22 12:30:17 UTC (rev 30632)
@@ -142,11 +142,6 @@
 			if((shi->layflag & SCE_LAY_SKY) && (R.r.alphamode==R_ADDSKY))
 				shr->alpha= 1.0f;
 	}	
-	
-	if(R.r.mode & R_RAYTRACE) {
-		if (R.render_volumes_inside.first)
-			shade_volume_inside(shi, shr);
-	}
 }
 
 
@@ -168,8 +163,12 @@
 		shade_input_init_material(shi);
 		
 		if (shi->mat->material_type == MA_TYPE_VOLUME) {
-			if(R.r.mode & R_RAYTRACE)
-				shade_volume_outside(shi, shr);
+			if(R.r.mode & R_RAYTRACE) {			
+				if (R.render_volumes_inside.first)
+					shade_volume_inside(shi, shr);
+				else
+					shade_volume_outside(shi, shr);
+			}
 		} else { /* MA_TYPE_SURFACE, MA_TYPE_WIRE */
 			shade_material_loop(shi, shr);
 		}

Modified: trunk/blender/source/blender/render/intern/source/volumetric.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/volumetric.c	2010-07-22 12:02:39 UTC (rev 30631)
+++ trunk/blender/source/blender/render/intern/source/volumetric.c	2010-07-22 12:30:17 UTC (rev 30632)
@@ -785,8 +785,6 @@
 	ObjectInstanceRen *obi_backup;
 	float prev_alpha = shr->alpha;
 	
-	//if (BLI_countlist(&R.render_volumes_inside) == 0) return;
-	
 	/* XXX: extend to multiple volumes perhaps later */
 	mat_backup = shi->mat;
 	obi_backup = shi->obi;