Revision: 17137
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17137
Author: broken
Date: 2008-10-21 02:54:01 +0200 (Tue, 21 Oct 2008)
Log Message:
-----------
accidentally left in some testing code from this morning
Modified Paths:
--------------
branches/sim_physics/source/blender/render/intern/source/volumetric.c
Modified: branches/sim_physics/source/blender/render/intern/source/volumetric.c
===================================================================
--- branches/sim_physics/source/blender/render/intern/source/volumetric.c
2008-10-21 00:21:02 UTC (rev 17136)
+++ branches/sim_physics/source/blender/render/intern/source/volumetric.c
2008-10-21 00:54:01 UTC (rev 17137)
@@ -925,19 +925,15 @@
}
/* don't bother if the point is not inside the
volume mesh */
- if (!point_inside_obi(tree, obi, co)) {
- obi->volume_precache[0*res_3 + x*res_2
+ y*res + z] = -1.0f;
- obi->volume_precache[1*res_3 + x*res_2
+ y*res + z] = -1.0f;
- obi->volume_precache[2*res_3 + x*res_2
+ y*res + z] = -1.0f;
- }
- else {
- density = vol_get_density(&shi, co);
- vol_get_scattering(&shi, scatter_col,
co, stepsize, density);
-
- obi->volume_precache[0*res_3 + x*res_2
+ y*res + z] = scatter_col[0];
- obi->volume_precache[1*res_3 + x*res_2
+ y*res + z] = scatter_col[1];
- obi->volume_precache[2*res_3 + x*res_2
+ y*res + z] = scatter_col[2];
- }
+ if (!point_inside_obi(tree, obi, co))
+ continue;
+
+ density = vol_get_density(&shi, co);
+ vol_get_scattering(&shi, scatter_col, co,
stepsize, density);
+
+ obi->volume_precache[0*res_3 + x*res_2 + y*res
+ z] = scatter_col[0];
+ obi->volume_precache[1*res_3 + x*res_2 + y*res
+ z] = scatter_col[1];
+ obi->volume_precache[2*res_3 + x*res_2 + y*res
+ z] = scatter_col[2];
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
