Merge branch 'volumetric_transparency_bug' into experimental

DavidBluecame · Oct 13, 2015 · 5ceec80 · 5ceec80
2 parents 6c36343 + 4c37a5c
commit 5ceec80
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/integrators/bidirpath.cc b/src/integrators/bidirpath.cc
@@ -941,8 +941,8 @@ color_t biDirIntegrator_t::evalPathE(renderState_t &state, int s, pathData_t &pd
 
 integrator_t* biDirIntegrator_t::factory(paraMap_t &params, renderEnvironment_t &render)
 {
-	bool bg_transp = true;
-	bool bg_transp_refract = true;
+	bool bg_transp = false;
+	bool bg_transp_refract = false;
 
 	params.getParam("bg_transp", bg_transp);
 	params.getParam("bg_transp_refract", bg_transp_refract);

diff --git a/src/integrators/directlight.cc b/src/integrators/directlight.cc
@@ -160,8 +160,8 @@ integrator_t* directLighting_t::factory(paraMap_t &params, renderEnvironment_t &
 	double cRad = 0.25;
 	double AO_dist = 1.0;
 	color_t AO_col(1.f);
-	bool bg_transp = true;
-	bool bg_transp_refract = true;
+	bool bg_transp = false;
+	bool bg_transp_refract = false;
 
 	params.getParam("raydepth", raydepth);
 	params.getParam("transpShad", transpShad);

diff --git a/src/integrators/pathtracer.cc b/src/integrators/pathtracer.cc
@@ -309,8 +309,8 @@ integrator_t* pathIntegrator_t::factory(paraMap_t &params, renderEnvironment_t &
 	int bounces = 3;
 	int raydepth = 5;
 	const std::string *cMethod=0;
-	bool bg_transp = true;
-	bool bg_transp_refract = true;
+	bool bg_transp = false;
+	bool bg_transp_refract = false;
 
 	params.getParam("raydepth", raydepth);
 	params.getParam("transpShad", transpShad);

diff --git a/src/integrators/photonintegr.cc b/src/integrators/photonintegr.cc
@@ -906,8 +906,8 @@ integrator_t* photonIntegrator_t::factory(paraMap_t &params, renderEnvironment_t
 	float dsRad=0.1;
 	float cRad=0.01;
 	float gatherDist=0.2;
-	bool bg_transp = true;
-	bool bg_transp_refract = true;
+	bool bg_transp = false;
+	bool bg_transp_refract = false;
 
 	params.getParam("transpShad", transpShad);
 	params.getParam("shadowDepth", shadowDepth);

diff --git a/src/integrators/sppm.cc b/src/integrators/sppm.cc
@@ -867,8 +867,8 @@ integrator_t* SPPM::factory(paraMap_t &params, renderEnvironment_t &render)
 	float times = 1.f;
 	int searchNum = 100;
 	float dsRad = 1.0f;
-	bool bg_transp = true;
-	bool bg_transp_refract = true;
+	bool bg_transp = false;
+	bool bg_transp_refract = false;
 
 	params.getParam("transpShad", transpShad);
 	params.getParam("shadowDepth", shadowDepth);