[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17191] branches/sim_physics/source/ blender/render/intern/source: removed debug stuff

[Matt Ebb]

Revision: 17191
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17191
Author:   broken
Date:     2008-10-23 04:03:54 +0200 (Thu, 23 Oct 2008)

Log Message:
-----------
removed debug stuff

Modified Paths:
--------------
    branches/sim_physics/source/blender/render/intern/source/convertblender.c
    branches/sim_physics/source/blender/render/intern/source/volumetric.c

Modified: branches/sim_physics/source/blender/render/intern/source/convertblender.c
===================================================================
--- branches/sim_physics/source/blender/render/intern/source/convertblender.c	2008-10-23 01:52:04 UTC (rev 17190)
+++ branches/sim_physics/source/blender/render/intern/source/convertblender.c	2008-10-23 02:03:54 UTC (rev 17191)
@@ -3094,7 +3094,6 @@
 					do_autosmooth= 1;
 			
 			if ((ma->material_type == MA_VOLUME) && (ma->vol_shadeflag & MA_VOL_PRECACHESHADING)) {
-				printf("before add_vol_precache \n");
 				add_vol_precache(re, obr, ma);
 			}
 		}
@@ -4928,10 +4927,8 @@
 				make_sss_tree(re);
 		
 		if(!re->test_break())
-			if(re->r.mode & R_RAYTRACE) {
-				printf("before volume_precache \n");
+			if(re->r.mode & R_RAYTRACE)
 				volume_precache(re);
-			}
 	}
 	
 	if(re->test_break())

Modified: branches/sim_physics/source/blender/render/intern/source/volumetric.c
===================================================================
--- branches/sim_physics/source/blender/render/intern/source/volumetric.c	2008-10-23 01:52:04 UTC (rev 17190)
+++ branches/sim_physics/source/blender/render/intern/source/volumetric.c	2008-10-23 02:03:54 UTC (rev 17191)
@@ -386,14 +386,10 @@
 	float shade_stepsize = vol_get_stepsize(shi, STEPSIZE_SHADE);
 	float shadfac[4];
 	
-	if (G.rt==5) printf("s_o_l pre checks col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
-	
 	if (lar->mode & LA_LAYER) if((lar->lay & shi->obi->lay)==0) return;
 	if ((lar->lay & shi->lay)==0) return;
 	if (lar->energy == 0.0) return;
 	
-	if (G.rt==5) printf("s_o_l post checks  col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
-	
 	visifac= lamp_get_visibility(lar, co, lv, &lampdist);
 	if(visifac==0.0f) return;
 
@@ -401,8 +397,6 @@
 	lacol[1] = lar->g;
 	lacol[2] = lar->b;
 	
-	if (G.rt==5) printf("s_o_l post lacol col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
-	
 	if(lar->mode & LA_TEXTURE) {
 		shi->osatex= 0;
 		do_lamp_tex(lar, lv, shi, lacol, LA_TEXTURE);
@@ -410,8 +404,6 @@
 
 	VecMulf(lacol, visifac*lar->energy);
 
-	if (G.rt==5) printf("s_o_l post energy col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
-	
 	if (ELEM(lar->type, LA_SUN, LA_HEMI))
 		VECCOPY(lv, lar->vec);
 	VecMulf(lv, -1.0f);
@@ -422,8 +414,6 @@
 	if (shi->mat->vol_shadeflag & MA_VOL_ATTENUATED) {
 		Isect is;
 		
-		if (G.rt==5) printf("s_o_l inside atten col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
-		
 		/* find minimum of volume bounds, or lamp coord */
 		if (vol_get_bounds(shi, co, lv, hitco, &is, VOL_BOUNDS_SS, 0)) {
 			float dist = VecLenf(co, hitco);
@@ -456,8 +446,6 @@
 		}
 	}
 	
-	if (G.rt==5) printf("s_o_l post atten col %f %f %f \n", lacol[0], lacol[1], lacol[2]);
-	
 	vol_get_scattering_fac(shi, &scatter_fac, co, density);
 	VecMulf(lacol, scatter_fac);
 }
@@ -471,21 +459,16 @@
 	float col[3] = {0.f, 0.f, 0.f};
 	int i=0;
 
-	if (G.rt==5) printf("lights count: %d \n", BLI_countlist(&R.lights));
-
 	for(go=R.lights.first; go; go= go->next)
 	{
 		float lacol[3] = {0.f, 0.f, 0.f};
 	
 		i++;
-		if (G.rt==5) printf("pre light %d \n", i);
 	
 		lar= go->lampren;
 		if (lar) {
-			if (G.rt==5) printf("pre vol_shade_one_lamp %d col %f %f %f \n", i, lacol[0], lacol[1], lacol[2]);
 			vol_shade_one_lamp(shi, co, lar, lacol, stepsize, density);
 			VecAddf(col, col, lacol);
-			if (G.rt==5) printf("post vol_shade_one_lamp %d col %f %f %f \n", i, lacol[0], lacol[1], lacol[2]);
 		}
 	}
 	
@@ -888,14 +871,11 @@
 	
 	R = *re;
 
-	if (G.rt==5) printf("before create raytree \n");
 	/* create a raytree with just the faces of the instanced ObjectRen, 
 	 * used for checking if the cached point is inside or outside. */
 	tree = create_raytree_obi(obi, bbmin, bbmax);
 	if (!tree) return;
 
-	if (G.rt==5) printf("after create raytree \n");
-
 	/* Need a shadeinput to calculate scattering */
 	memset(&shi, 0, sizeof(ShadeInput)); 
 	shi.depth= 1;
@@ -921,8 +901,6 @@
 		return;
 	VecMulf(voxel, 1.0f/res);
 	
-	if (G.rt==5) printf("before alloc \n");
-	
 	obi->volume_precache = MEM_callocN(sizeof(float)*res_3*3, "volume light cache");
 	
 	/* Iterate over the 3d voxel grid, and fill the voxels with scattering information
@@ -961,11 +939,9 @@
 				}
 				
 				/* don't bother if the point is not inside the volume mesh */
-				if (!point_inside_obi(tree, obi, co)) {
-					if (G.rt==5) printf("not inside mesh \n");
+				if (!point_inside_obi(tree, obi, co))
 					continue;
-				}
-				if (G.rt==5) printf("inside mesh \n");
+
 				density = vol_get_density(&shi, co);
 				vol_get_scattering(&shi, scatter_col, co, stepsize, density);
 			
@@ -991,8 +967,6 @@
 	ObjectInstanceRen *obi;
 	VolPrecache *vp;
 
-	if (G.rt==5) printf("precache obs: %d \n", BLI_countlist(&re->vol_precache_obs));
-
 	for(vp= re->vol_precache_obs.first; vp; vp= vp->next) {
 		for(obi= re->instancetable.first; obi; obi= obi->next) {
 			if (obi->obr == vp->obr)