Initialize the progressbar pointer (intpb) in the base integrator class.

Gustavo Pichorim Boiko · Gustavo Pichorim Boiko · commit 0e803fdcd7b2 · 2012-05-18T15:53:24.000-03:00
This fixes a crash reported in this bug: http://www.yafaray.org/node/497
diff --git a/include/core_api/integrator.h b/include/core_api/integrator.h
@@ -40,6 +40,7 @@ class renderArea_t;
 class YAFRAYCORE_EXPORT integrator_t
 {
 	public:
+		integrator_t() { scene = 0; intpb = 0; }
 		//! this MUST be called before any other member function!
 		void setScene(scene_t *s) { scene=s; }
 		/*! do whatever is required to render the image, if suitable for integrating whole image */
diff --git a/src/integrators/bidirpath.cc b/src/integrators/bidirpath.cc
@@ -155,7 +155,6 @@ biDirIntegrator_t::biDirIntegrator_t(bool transpShad, int shadowDepth): trShad(t
 		lightPowerD(0), lightImage(0)
 {
 	type = SURFACE;
-	intpb = 0;
 	integratorName = "BidirectionalPathTracer";
 	integratorShortName = "BdPT";
 	settings = "";
diff --git a/src/integrators/directlight.cc b/src/integrators/directlight.cc
@@ -49,7 +49,6 @@ directLighting_t::directLighting_t(bool transpShad, int shadowDepth, int rayDept
 	usePhotonCaustics = false;
 	sDepth = shadowDepth;
 	rDepth = rayDepth;
-	intpb = 0;
 	integratorName = "DirectLight";
 	integratorShortName = "DL";
 }
diff --git a/src/integrators/photonintegr.cc b/src/integrators/photonintegr.cc
@@ -114,7 +114,6 @@ photonIntegrator_t::photonIntegrator_t(unsigned int dPhotons, unsigned int cPhot
 	causRadius = cRad;
 	rDepth = 6;
 	maxBounces = 5;
-	intpb = 0;
 	integratorName = "PhotonMap";
 	integratorShortName = "PM";
 }
diff --git a/src/integrators/sppm.cc b/src/integrators/sppm.cc
@@ -11,7 +11,6 @@ const int nMaxGather = 1000; //used to gather all the photon in the radius. seem
 SPPM::SPPM(unsigned int dPhotons, int _passnum, bool transpShad, int shadowDepth)
 {
 	type = SURFACE;
-	intpb = 0;
 	integratorName = "SPPM";
 	integratorShortName = "SPPM";
 	nPhotons = dPhotons;

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ class renderArea_t;`
`40`	`40`	`class YAFRAYCORE_EXPORT integrator_t`
`41`	`41`	`{`
`42`	`42`	`public:`
	`43`	`+ integrator_t() { scene = 0; intpb = 0; }`
`43`	`44`	`//! this MUST be called before any other member function!`
`44`	`45`	`void setScene(scene_t *s) { scene=s; }`
`45`	`46`	`/! do whatever is required to render the image, if suitable for integrating whole image /`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,6 @@ biDirIntegrator_t::biDirIntegrator_t(bool transpShad, int shadowDepth): trShad(t`
`155`	`155`	`lightPowerD(0), lightImage(0)`
`156`	`156`	`{`
`157`	`157`	`type = SURFACE;`
`158`		`- intpb = 0;`
`159`	`158`	`integratorName = "BidirectionalPathTracer";`
`160`	`159`	`integratorShortName = "BdPT";`
`161`	`160`	`settings = "";`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ directLighting_t::directLighting_t(bool transpShad, int shadowDepth, int rayDept`
`49`	`49`	`usePhotonCaustics = false;`
`50`	`50`	`sDepth = shadowDepth;`
`51`	`51`	`rDepth = rayDepth;`
`52`		`- intpb = 0;`
`53`	`52`	`integratorName = "DirectLight";`
`54`	`53`	`integratorShortName = "DL";`
`55`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,6 @@ photonIntegrator_t::photonIntegrator_t(unsigned int dPhotons, unsigned int cPhot`
`114`	`114`	`causRadius = cRad;`
`115`	`115`	`rDepth = 6;`
`116`	`116`	`maxBounces = 5;`
`117`		`- intpb = 0;`
`118`	`117`	`integratorName = "PhotonMap";`
`119`	`118`	`integratorShortName = "PM";`
`120`	`119`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ const int nMaxGather = 1000; //used to gather all the photon in the radius. seem`
`11`	`11`	`SPPM::SPPM(unsigned int dPhotons, int _passnum, bool transpShad, int shadowDepth)`
`12`	`12`	`{`
`13`	`13`	`type = SURFACE;`
`14`		`- intpb = 0;`
`15`	`14`	`integratorName = "SPPM";`
`16`	`15`	`integratorShortName = "SPPM";`
`17`	`16`	`nPhotons = dPhotons;`