[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16102] branches/blender-2.47/source/ gameengine/Ketsji: branches/blender-2.47
Diego Borghetti
bdiego at gmail.com
Thu Aug 14 08:09:57 CEST 2008
Revision: 16102
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16102
Author: bdiego
Date: 2008-08-14 08:09:57 +0200 (Thu, 14 Aug 2008)
Log Message:
-----------
branches/blender-2.47
Merge from trunk:
Revision: 16100
Modified Paths:
--------------
branches/blender-2.47/source/gameengine/Ketsji/KX_GameObject.cpp
branches/blender-2.47/source/gameengine/Ketsji/KX_MeshProxy.cpp
Modified: branches/blender-2.47/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- branches/blender-2.47/source/gameengine/Ketsji/KX_GameObject.cpp 2008-08-14 05:57:09 UTC (rev 16101)
+++ branches/blender-2.47/source/gameengine/Ketsji/KX_GameObject.cpp 2008-08-14 06:09:57 UTC (rev 16102)
@@ -941,7 +941,7 @@
KX_Scene *scene = PHY_GetActiveScene();
scene->DelayedRemoveObject(this);
- return Py_None;
+ Py_RETURN_NONE;
}
Modified: branches/blender-2.47/source/gameengine/Ketsji/KX_MeshProxy.cpp
===================================================================
--- branches/blender-2.47/source/gameengine/Ketsji/KX_MeshProxy.cpp 2008-08-14 05:57:09 UTC (rev 16101)
+++ branches/blender-2.47/source/gameengine/Ketsji/KX_MeshProxy.cpp 2008-08-14 06:09:57 UTC (rev 16102)
@@ -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;//Py_Success(KX_ReInstanceShapeFromMesh(m_meshobj));
+ Py_RETURN_NONE;//(KX_ReInstanceShapeFromMesh(m_meshobj)) ? Py_RETURN_TRUE : Py_RETURN_FALSE;
}
More information about the Bf-blender-cvs
mailing list