[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13934] trunk/blender: Mem leak fixed in sound buffer & parent invert node

[Benoit Bolsee]

Revision: 13934
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13934
Author:   ben2610
Date:     2008-03-01 20:29:01 +0100 (Sat, 01 Mar 2008)

Log Message:
-----------
Mem leak fixed in sound buffer & parent invert node

Modified Paths:
--------------
    trunk/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp
    trunk/blender/source/gameengine/SceneGraph/SG_IObject.cpp

Modified: trunk/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp
===================================================================
--- trunk/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp	2008-03-01 19:17:37 UTC (rev 13933)
+++ trunk/blender/intern/SoundSystem/openal/SND_OpenALDevice.cpp	2008-03-01 19:29:01 UTC (rev 13934)
@@ -332,12 +332,6 @@
 {
 	MakeCurrent();
 	
-	if (m_buffersinitialized)
-	{
-		alDeleteBuffers(NUM_BUFFERS, m_buffers);
-		m_buffersinitialized = false;
-	}
-	
 	if (m_sourcesinitialized)
 	{
 		for (int i = 0; i < NUM_SOURCES; i++)
@@ -347,6 +341,12 @@
 		m_sourcesinitialized = false;
 	}
 	
+	if (m_buffersinitialized)
+	{
+		alDeleteBuffers(NUM_BUFFERS, m_buffers);
+		m_buffersinitialized = false;
+	}
+	
 	if (m_context) {
 		MakeCurrent();
 #ifdef AL_VERSION_1_1

Modified: trunk/blender/source/gameengine/SceneGraph/SG_IObject.cpp
===================================================================
--- trunk/blender/source/gameengine/SceneGraph/SG_IObject.cpp	2008-03-01 19:17:37 UTC (rev 13933)
+++ trunk/blender/source/gameengine/SceneGraph/SG_IObject.cpp	2008-03-01 19:29:01 UTC (rev 13934)
@@ -128,6 +128,11 @@
 		// Call client provided destruction function on this!
 		m_callbacks.m_destructionfunc(this,m_SGclientObject,m_SGclientInfo);
 	}
+	else
+	{
+		// no callback but must still destroy the node to avoid memory leak
+		delete this;
+	}
 }
 
 	void