Fixed a bug in the cleanup of sky_sphere transforms.

c-lipka · c-lipka · commit 0f349a7a488a · 2016-02-18T06:08:27.000+01:00
Also cleaned up cleanup (no pun intended) of object transforms along the way.
diff --git a/source/core/scene/atmosphere.cpp b/source/core/scene/atmosphere.cpp
@@ -452,6 +452,12 @@ void Destroy_Skysphere(SKYSPHERE *Skysphere)
         delete Skysphere;
 }
 
+Skysphere_Struct::~Skysphere_Struct()
+{
+	for (vector<PIGMENT*>::iterator i = Pigments.begin(); i != Pigments.end(); ++ i)
+		delete *i;
+	Destroy_Transform(Trans);
+}
 
 
 /*****************************************************************************
diff --git a/source/core/scene/atmosphere.h b/source/core/scene/atmosphere.h
@@ -96,7 +96,7 @@ struct Rainbow_Struct
 struct Skysphere_Struct
 {
     Skysphere_Struct() : Trans(NULL) {}
-    ~Skysphere_Struct() { for (vector<PIGMENT*>::iterator i = Pigments.begin(); i != Pigments.end(); ++ i) delete *i; if (Trans) POV_FREE(Trans); }
+    ~Skysphere_Struct();
     MathColour        Emission; ///< Brightness adjustment.
     vector<PIGMENT *> Pigments; ///< Pigment(s) to use.
     TRANSFORM *       Trans;    ///< Skysphere transformation.
diff --git a/source/core/scene/object.cpp b/source/core/scene/object.cpp
@@ -824,6 +824,11 @@ void Destroy_Object(ObjectPtr Object)
     }
 }
 
+ObjectBase::~ObjectBase()
+{
+	Destroy_Transform(Trans);
+}
+
 
 /*****************************************************************************
 *
diff --git a/source/core/scene/object.h b/source/core/scene/object.h
@@ -206,7 +206,7 @@ class ObjectBase
                 o.LLights.clear();
             }
         }
-        virtual ~ObjectBase() { }
+		virtual ~ObjectBase();
 
         virtual ObjectPtr Copy() = 0;
 
diff --git a/source/core/shape/blob.cpp b/source/core/shape/blob.cpp
@@ -2187,7 +2187,6 @@ Blob_List_Struct *Blob::Create_Blob_List_Element()
 
 Blob::~Blob()
 {
-    Destroy_Transform(Trans);
     for (vector<TEXTURE*>::iterator i = Element_Texture.begin(); i != Element_Texture.end(); ++i)
         Destroy_Textures(*i);
     if (Data != NULL)
diff --git a/source/core/shape/box.cpp b/source/core/shape/box.cpp
@@ -903,9 +903,7 @@ ObjectPtr Box::Copy()
 ******************************************************************************/
 
 Box::~Box()
-{
-    Destroy_Transform(Trans);
-}
+{}
 
 
 
diff --git a/source/core/shape/cone.cpp b/source/core/shape/cone.cpp
@@ -883,9 +883,7 @@ void Cone::Compute_Cylinder_Data()
 ******************************************************************************/
 
 Cone::~Cone()
-{
-    Destroy_Transform(Trans);
-}
+{}
 
 
 
diff --git a/source/core/shape/disc.cpp b/source/core/shape/disc.cpp
@@ -501,9 +501,7 @@ ObjectPtr Disc::Copy()
 ******************************************************************************/
 
 Disc::~Disc()
-{
-    Destroy_Transform(Trans);
-}
+{}
 
 
 
diff --git a/source/core/shape/fractal.cpp b/source/core/shape/fractal.cpp
@@ -697,9 +697,7 @@ ObjectPtr Fractal::Copy()
 ******************************************************************************/
 
 Fractal::~Fractal()
-{
-    Destroy_Transform(Trans);
-}
+{}
 
 /*****************************************************************************
 *
diff --git a/source/core/shape/heightfield.cpp b/source/core/shape/heightfield.cpp
@@ -1297,8 +1297,6 @@ HField::~HField()
 {
     int i;
 
-    Destroy_Transform(Trans);
-
     if (--(Data->References) == 0)
     {
         if (Data->Map != NULL)
diff --git a/source/core/shape/isosurface.cpp b/source/core/shape/isosurface.cpp
@@ -619,7 +619,6 @@ IsoSurface::~IsoSurface()
     if(--mginfo->refcnt == 0)
         POV_FREE(mginfo);
     delete Function;
-    Destroy_Transform(Trans);
 }
 
 /*****************************************************************************
diff --git a/source/core/shape/lathe.cpp b/source/core/shape/lathe.cpp
@@ -862,8 +862,6 @@ ObjectPtr Lathe::Copy()
 
 Lathe::~Lathe()
 {
-    Destroy_Transform(Trans);
-
     if (--(Spline->References) == 0)
     {
         Destroy_BCyl(Spline->BCyl);
diff --git a/source/core/shape/mesh.cpp b/source/core/shape/mesh.cpp
@@ -705,8 +705,6 @@ Mesh::~Mesh()
 {
     MeshIndex i;
 
-    Destroy_Transform(Trans);
-
     /* NK 1999 move texture outside of data block */
     if (Textures != NULL)
     {
diff --git a/source/core/shape/ovus.cpp b/source/core/shape/ovus.cpp
@@ -774,9 +774,7 @@ ObjectPtr Ovus::Copy()
 ******************************************************************************/
 
 Ovus::~Ovus()
-{
-    Destroy_Transform(Trans);
-}
+{}
 
 
 
diff --git a/source/core/shape/parametric.cpp b/source/core/shape/parametric.cpp
@@ -684,7 +684,6 @@ ObjectPtr Parametric::Copy()
 
 Parametric::~Parametric()
 {
-    Destroy_Transform(Trans);
     delete Function[0];
     delete Function[1];
     delete Function[2];
diff --git a/source/core/shape/plane.cpp b/source/core/shape/plane.cpp
@@ -572,9 +572,7 @@ ObjectPtr Plane::Copy()
 ******************************************************************************/
 
 Plane::~Plane()
-{
-    Destroy_Transform(Trans);
-}
+{}
 
 
 
diff --git a/source/core/shape/polygon.cpp b/source/core/shape/polygon.cpp
@@ -594,8 +594,6 @@ Polygon::~Polygon()
 
         POV_FREE (Data);
     }
-
-    Destroy_Transform(Trans);
 }
 
 
diff --git a/source/core/shape/polynomial.cpp b/source/core/shape/polynomial.cpp
@@ -1455,8 +1455,6 @@ ObjectPtr Poly::Copy()
 
 Poly::~Poly()
 {
-    Destroy_Transform(Trans);
-
     POV_FREE(Coeffs);
 }
 
diff --git a/source/core/shape/prism.cpp b/source/core/shape/prism.cpp
@@ -1031,8 +1031,6 @@ ObjectPtr Prism::Copy()
 
 Prism::~Prism()
 {
-    Destroy_Transform(Trans);
-
     if (--(Spline->References) == 0)
     {
         POV_FREE(Spline->Entry);
diff --git a/source/core/shape/sor.cpp b/source/core/shape/sor.cpp
@@ -860,8 +860,6 @@ ObjectPtr Sor::Copy()
 
 Sor::~Sor()
 {
-    Destroy_Transform(Trans);
-
     if (--(Spline->References) == 0)
     {
         Destroy_BCyl(Spline->BCyl);
diff --git a/source/core/shape/sphere.cpp b/source/core/shape/sphere.cpp
@@ -649,7 +649,6 @@ Sphere::~Sphere()
     Debug_Info("}\n");
 #endif
 
-    Destroy_Transform(Trans);
     Destroy_Transform(UV_Trans);
 }
 
diff --git a/source/core/shape/spheresweep.cpp b/source/core/shape/spheresweep.cpp
@@ -1290,8 +1290,6 @@ void SphereSweep::Transform(const TRANSFORM *tr)
 
 SphereSweep::~SphereSweep()
 {
-    Destroy_Transform(Trans);
-
     POV_FREE(Modeling_Sphere);
     POV_FREE(Sphere);
     POV_FREE(Segment);
diff --git a/source/core/shape/superellipsoid.cpp b/source/core/shape/superellipsoid.cpp
@@ -742,9 +742,7 @@ ObjectPtr Superellipsoid::Copy()
 ******************************************************************************/
 
 Superellipsoid::~Superellipsoid()
-{
-    Destroy_Transform(Trans);
-}
+{}
 
 
 
diff --git a/source/core/shape/torus.cpp b/source/core/shape/torus.cpp
@@ -800,9 +800,7 @@ ObjectPtr SpindleTorus::Copy()
 ******************************************************************************/
 
 Torus::~Torus()
-{
-    Destroy_Transform(Trans);
-}
+{}
 
 SpindleTorus::~SpindleTorus()
 {}
diff --git a/source/core/shape/truetype.cpp b/source/core/shape/truetype.cpp
@@ -2943,9 +2943,7 @@ TrueType::TrueType() : ObjectBase(TTF_OBJECT)
 }
 
 TrueType::~TrueType()
-{
-    Destroy_Transform(Trans);
-}
+{}
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ struct Rainbow_Struct`
`96`	`96`	`struct Skysphere_Struct`
`97`	`97`	`{`
`98`	`98`	`Skysphere_Struct() : Trans(NULL) {}`
`99`		`- ~Skysphere_Struct() { for (vector<PIGMENT>::iterator i = Pigments.begin(); i != Pigments.end(); ++ i) delete i; if (Trans) POV_FREE(Trans); }`
	`99`	`+ ~Skysphere_Struct();`
`100`	`100`	`MathColour Emission; ///< Brightness adjustment.`
`101`	`101`	`vector<PIGMENT *> Pigments; ///< Pigment(s) to use.`
`102`	`102`	`TRANSFORM * Trans; ///< Skysphere transformation.`
Original file line number	Diff line number	Diff line change
`@@ -824,6 +824,11 @@ void Destroy_Object(ObjectPtr Object)`
`824`	`824`	`}`
`825`	`825`	`}`
`826`	`826`
	`827`	`+ObjectBase::~ObjectBase()`
	`828`	`+{`
	`829`	`+ Destroy_Transform(Trans);`
	`830`	`+}`
	`831`	`+`
`827`	`832`
`828`	`833`	`/*****************************************************************************`
`829`	`834`	`*`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ class ObjectBase`
`206`	`206`	`o.LLights.clear();`
`207`	`207`	`}`
`208`	`208`	`}`
`209`		`- virtual ~ObjectBase() { }`
	`209`	`+ virtual ~ObjectBase();`
`210`	`210`
`211`	`211`	`virtual ObjectPtr Copy() = 0;`
`212`	`212`
Original file line number	Diff line number	Diff line change
`@@ -2187,7 +2187,6 @@ Blob_List_Struct *Blob::Create_Blob_List_Element()`
`2187`	`2187`
`2188`	`2188`	`Blob::~Blob()`
`2189`	`2189`	`{`
`2190`		`- Destroy_Transform(Trans);`
`2191`	`2190`	`for (vector<TEXTURE*>::iterator i = Element_Texture.begin(); i != Element_Texture.end(); ++i)`
`2192`	`2191`	`Destroy_Textures(*i);`
`2193`	`2192`	`if (Data != NULL)`
Original file line number	Diff line number	Diff line change
`@@ -697,9 +697,7 @@ ObjectPtr Fractal::Copy()`
`697`	`697`	`******************************************************************************/`
`698`	`698`
`699`	`699`	`Fractal::~Fractal()`
`700`		`-{`
`701`		`- Destroy_Transform(Trans);`
`702`		`-}`
	`700`	`+{}`
`703`	`701`
`704`	`702`	`/*****************************************************************************`
`705`	`703`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1297,8 +1297,6 @@ HField::~HField()`
`1297`	`1297`	`{`
`1298`	`1298`	`int i;`
`1299`	`1299`
`1300`		`- Destroy_Transform(Trans);`
`1301`		`-`
`1302`	`1300`	`if (--(Data->References) == 0)`
`1303`	`1301`	`{`
`1304`	`1302`	`if (Data->Map != NULL)`