Skip to content

Commit edfae26

Browse files
committed
Fixed a bug in cleanup of fog with turbulence.
1 parent 3b5b4eb commit edfae26

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

source/base/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
#define OFFICIAL_VERSION_STRING "3.7.1"
4646
#define OFFICIAL_VERSION_NUMBER 371
4747

48-
#define POV_RAY_PRERELEASE "alpha.8697421"
48+
#define POV_RAY_PRERELEASE "alpha.8698543"
4949

5050
#if (POV_RAY_IS_AUTOBUILD == 1) && ((POV_RAY_IS_OFFICIAL == 1) || (POV_RAY_IS_SEMI_OFFICIAL == 1))
5151
#ifdef POV_RAY_PRERELEASE

source/core/scene/atmosphere.cpp

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,16 @@
5050
namespace pov
5151
{
5252

53+
Fog_Struct::Fog_Struct() :
54+
Turb(NULL),
55+
Next(NULL)
56+
{}
57+
58+
Fog_Struct::~Fog_Struct()
59+
{
60+
if (Turb) delete Turb;
61+
}
62+
5363
/*****************************************************************************
5464
*
5565
* FUNCTION
@@ -454,9 +464,9 @@ void Destroy_Skysphere(SKYSPHERE *Skysphere)
454464

455465
Skysphere_Struct::~Skysphere_Struct()
456466
{
457-
for (vector<PIGMENT*>::iterator i = Pigments.begin(); i != Pigments.end(); ++ i)
458-
delete *i;
459-
Destroy_Transform(Trans);
467+
for (vector<PIGMENT*>::iterator i = Pigments.begin(); i != Pigments.end(); ++ i)
468+
delete *i;
469+
Destroy_Transform(Trans);
460470
}
461471

462472

source/core/scene/atmosphere.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ struct TurbulenceWarp; // full declaration in core/material/warp.h
6666

6767
struct Fog_Struct
6868
{
69-
Fog_Struct() : Turb(NULL), Next(NULL) {}
70-
~Fog_Struct() { if (Turb) POV_FREE(Turb); }
69+
Fog_Struct();
70+
~Fog_Struct();
7171
int Type;
7272
DBL Distance;
7373
DBL Alt;

unix/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.7.1-alpha.8697421
1+
3.7.1-alpha.8698543

0 commit comments

Comments
 (0)