[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16100] trunk/blender/source/gameengine/ Ketsji: bugfix (good for 2.47) - 2 cases of returning Py_None without increfing it.

Campbell Barton ideasman42 at gmail.com
Thu Aug 14 07:07:00 CEST 2008


Revision: 16100
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16100
Author:   campbellbarton
Date:     2008-08-14 07:06:59 +0200 (Thu, 14 Aug 2008)

Log Message:
-----------
bugfix (good for 2.47) - 2 cases of returning Py_None without increfing it. this can crash blender.

Modified Paths:
--------------
    trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
    trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp

Modified: trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp	2008-08-14 04:14:13 UTC (rev 16099)
+++ trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp	2008-08-14 05:06:59 UTC (rev 16100)
@@ -942,7 +942,7 @@
 	KX_Scene *scene = PHY_GetActiveScene();
 	scene->DelayedRemoveObject(this);
 	
-	return Py_None;
+	Py_RETURN_NONE;
 
 }
 

Modified: trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp	2008-08-14 04:14:13 UTC (rev 16099)
+++ trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp	2008-08-14 05:06:59 UTC (rev 16100)
@@ -238,5 +238,5 @@
 "Reinstance the physics mesh.")
 {
 	//this needs to be reviewed, it is dependend on Sumo/Solid. Who is using this ?
-	return Py_None;//(KX_ReInstanceShapeFromMesh(m_meshobj)) ? Py_RETURN_TRUE : Py_RETURN_FALSE;
+	Py_RETURN_NONE;//(KX_ReInstanceShapeFromMesh(m_meshobj)) ? Py_RETURN_TRUE : Py_RETURN_FALSE;
 }





More information about the Bf-blender-cvs mailing list