[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16846] branches/sim_physics/source/ blender: * Removed the volume 'layer depth' control' (was used to

[Matt Ebb]

Revision: 16846
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16846
Author:   broken
Date:     2008-09-30 12:41:47 +0200 (Tue, 30 Sep 2008)

Log Message:
-----------
* Removed the volume 'layer depth' control' (was used to 
limit ray intersections like as for ray transparency). It 
remains to be seen if it's even that useful, and was 
preventing refracting materials behind volumes from 
working easily.

Modified Paths:
--------------
    branches/sim_physics/source/blender/blenkernel/intern/material.c
    branches/sim_physics/source/blender/blenloader/intern/readfile.c
    branches/sim_physics/source/blender/makesdna/DNA_material_types.h
    branches/sim_physics/source/blender/render/intern/source/volumetric.c

Modified: branches/sim_physics/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/sim_physics/source/blender/blenkernel/intern/material.c	2008-09-30 09:27:37 UTC (rev 16845)
+++ branches/sim_physics/source/blender/blenkernel/intern/material.c	2008-09-30 10:41:47 UTC (rev 16846)
@@ -172,7 +172,6 @@
 	ma->vol_absorption = 1.0f;
 	ma->vol_scattering = 1.0f;
 	ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
-	ma->vol_raydepth = 15;
 	
 	ma->mode= MA_TRACEBLE|MA_SHADBUF|MA_SHADOW|MA_RADIO|MA_RAYBIAS|MA_TANGENT_STR;
 

Modified: branches/sim_physics/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/sim_physics/source/blender/blenloader/intern/readfile.c	2008-09-30 09:27:37 UTC (rev 16845)
+++ branches/sim_physics/source/blender/blenloader/intern/readfile.c	2008-09-30 10:41:47 UTC (rev 16846)
@@ -7888,8 +7888,7 @@
 				ma->vol_stepsize = 0.2f;
 				ma->vol_absorption = 1.0f;
 				ma->vol_scattering = 1.0f;
-				ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;
-				if (ma->vol_raydepth == 0) ma->vol_raydepth = 15;
+				ma->vol_absorption_col[0] = ma->vol_absorption_col[1] = ma->vol_absorption_col[2] = 0.0f;	
 			}
 		}
 	}

Modified: branches/sim_physics/source/blender/makesdna/DNA_material_types.h
===================================================================
--- branches/sim_physics/source/blender/makesdna/DNA_material_types.h	2008-09-30 09:27:37 UTC (rev 16845)
+++ branches/sim_physics/source/blender/makesdna/DNA_material_types.h	2008-09-30 10:41:47 UTC (rev 16846)
@@ -70,9 +70,8 @@
 	float vol_stepsize, vol_shade_stepsize;
 	float vol_absorption, vol_scattering;
 	float vol_absorption_col[3];
-	short vol_raydepth;
 	short vol_shadeflag;
-	int volpad;
+	short volpad[3];
 		
 	float fresnel_mir, fresnel_mir_i;
 	float fresnel_tra, fresnel_tra_i;

Modified: branches/sim_physics/source/blender/render/intern/source/volumetric.c
===================================================================
--- branches/sim_physics/source/blender/render/intern/source/volumetric.c	2008-09-30 09:27:37 UTC (rev 16845)
+++ branches/sim_physics/source/blender/render/intern/source/volumetric.c	2008-09-30 10:41:47 UTC (rev 16846)
@@ -436,7 +436,6 @@
 	
 	shi_new.mask= shi->mask;
 	shi_new.osatex= shi->osatex;
-	shi_new.depth= shi->depth + 1;
 	shi_new.thread= shi->thread;
 	shi_new.xs= shi->xs;
 	shi_new.ys= shi->ys;
@@ -450,8 +449,7 @@
 	
 	memset(&shr_new, 0, sizeof(ShadeResult));
 	
-	if (shi->depth < shi->mat->vol_raydepth) 
-		shade_ray(is, &shi_new, &shr_new);
+	shade_ray(is, &shi_new, &shr_new);
 	
 	col[0] = shr_new.combined[0];
 	col[1] = shr_new.combined[1];