[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22629] branches/blender2.5/blender: - fix for BGE warnings

Campbell Barton ideasman42 at gmail.com
Wed Aug 19 12:26:44 CEST 2009


Revision: 22629
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22629
Author:   campbellbarton
Date:     2009-08-19 12:26:43 +0200 (Wed, 19 Aug 2009)

Log Message:
-----------
- fix for BGE warnings
- when C++ uses guardedalloc SYS_DeleteSystem was called after MEM_printmemlist(), making it look like there was a leak.

Modified Paths:
--------------
    branches/blender2.5/blender/intern/string/STR_String.h
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c
    branches/blender2.5/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
    branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
    branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/blender2.5/blender/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_IpoActuator.h
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/blender2.5/blender/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
    branches/blender2.5/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/blender2.5/blender/source/gameengine/VideoTexture/ImageBase.cpp

Modified: branches/blender2.5/blender/intern/string/STR_String.h
===================================================================
--- branches/blender2.5/blender/intern/string/STR_String.h	2009-08-19 10:19:40 UTC (rev 22628)
+++ branches/blender2.5/blender/intern/string/STR_String.h	2009-08-19 10:26:43 UTC (rev 22629)
@@ -50,6 +50,9 @@
 
 using namespace std;
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
 
 class STR_String;
 
@@ -191,6 +194,13 @@
 	char   *pData;													// -> STR_String data
 	int	   Len;														// Data length
 	int	   Max;														// Space in data buffer
+
+
+#ifdef WITH_CXX_GUARDEDALLOC
+public:
+	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "CXX:STR_String"); }
+	void operator delete( void *mem ) { MEM_freeN(mem); }
+#endif
 };
 
 inline  STR_String operator+(rcSTR_String    lhs, rcSTR_String   rhs)	{ return STR_String(lhs.ReadPtr(), lhs.Length(), rhs.ReadPtr(), rhs.Length()); }

Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c	2009-08-19 10:19:40 UTC (rev 22628)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c	2009-08-19 10:26:43 UTC (rev 22629)
@@ -266,6 +266,8 @@
 
 	CTX_free(C);
 	
+	SYS_DeleteSystem(SYS_GetSystem());
+
 	if(MEM_get_memory_blocks_in_use()!=0) {
 		printf("Error Totblock: %d\n", MEM_get_memory_blocks_in_use());
 		MEM_printmemlist();
@@ -282,9 +284,6 @@
 	}
 #endif 
 	
-	
-	SYS_DeleteSystem(SYS_GetSystem());
-	
 	exit(G.afbreek==1);
 }
 

Modified: branches/blender2.5/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/BL_ArmatureObject.cpp	2009-08-19 10:19:40 UTC (rev 22628)
+++ branches/blender2.5/blender/source/gameengine/Converter/BL_ArmatureObject.cpp	2009-08-19 10:26:43 UTC (rev 22629)
@@ -54,8 +54,8 @@
 
 :	KX_GameObject(sgReplicationInfo,callbacks),
 	m_objArma(armature),
+	m_framePose(NULL),
 	m_scene(scene), // maybe remove later. needed for where_is_pose
-	m_framePose(NULL),
 	m_lastframe(0.0),
 	m_activeAct(NULL),
 	m_activePriority(999),

Modified: branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp	2009-08-19 10:19:40 UTC (rev 22628)
+++ branches/blender2.5/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp	2009-08-19 10:26:43 UTC (rev 22629)
@@ -109,8 +109,8 @@
 {
 	if (!m_shapeDrivers.empty() && PoseUpdated()) {
 		vector<IpoCurve*>::iterator it;
-		void *poin;
-		int type;
+//		void *poin;
+//		int type;
 
 		// the shape drivers use the bone matrix as input. Must 
 		// update the matrix now

Modified: branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp	2009-08-19 10:19:40 UTC (rev 22628)
+++ branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp	2009-08-19 10:26:43 UTC (rev 22629)
@@ -62,7 +62,7 @@
 	}
 }
 
-KX_IScalarInterpolator *BL_InterpolatorList::GetScalarInterpolator(char *rna_path, int array_index) {
+KX_IScalarInterpolator *BL_InterpolatorList::GetScalarInterpolator(const char *rna_path, int array_index) {
 	for(BL_InterpolatorList::iterator i = begin(); (i != end()) ; i++ )
 	{
 		FCurve *fcu= (static_cast<BL_ScalarInterpolator *>(*i))->GetFCurve();

Modified: branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.h	2009-08-19 10:19:40 UTC (rev 22628)
+++ branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.h	2009-08-19 10:26:43 UTC (rev 22629)
@@ -64,7 +64,7 @@
 	BL_InterpolatorList(struct AnimData *adt);
 	~BL_InterpolatorList();
 
-	KX_IScalarInterpolator *GetScalarInterpolator(char *rna_path, int array_index);	
+	KX_IScalarInterpolator *GetScalarInterpolator(const char *rna_path, int array_index);	
 
 
 #ifdef WITH_CXX_GUARDEDALLOC

Modified: branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp	2009-08-19 10:19:40 UTC (rev 22628)
+++ branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp	2009-08-19 10:26:43 UTC (rev 22629)
@@ -795,6 +795,7 @@
 				Object* blenderObject = gameObj->GetBlenderObject();
 				if (blenderObject && blenderObject->ipo)
 				{
+#if 0
 					const MT_Point3& position = gameObj->NodeGetWorldPosition();
 					//const MT_Vector3& scale = gameObj->NodeGetWorldScaling();
 					const MT_Matrix3x3& orn = gameObj->NodeGetWorldOrientation();
@@ -804,7 +805,6 @@
 					float tmat[3][3];
 					
 					// XXX animato
-#if 0
 					Ipo* ipo = blenderObject->ipo;
 
 					//create the curves, if not existing, set linear if new

Modified: branches/blender2.5/blender/source/gameengine/Converter/KX_IpoConvert.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/KX_IpoConvert.cpp	2009-08-19 10:19:40 UTC (rev 22628)
+++ branches/blender2.5/blender/source/gameengine/Converter/KX_IpoConvert.cpp	2009-08-19 10:26:43 UTC (rev 22629)
@@ -175,7 +175,7 @@
 			KX_ObColorIpoSGController* ipocontr_obcol=NULL;
 			
 			for(int i=0; i<4; i++) {
-				if (interp = adtList->GetScalarInterpolator("color", i)) {
+				if ((interp = adtList->GetScalarInterpolator("color", i))) {
 					if (!ipocontr_obcol) {
 						ipocontr_obcol = new KX_ObColorIpoSGController();
 						gameobj->GetSGNode()->AddSGController(ipocontr_obcol);

Modified: branches/blender2.5/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp	2009-08-19 10:19:40 UTC (rev 22628)
+++ branches/blender2.5/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp	2009-08-19 10:26:43 UTC (rev 22629)
@@ -38,9 +38,6 @@
 
 #include "PyObjectPlus.h" 
 
-STR_String KX_CameraActuator::X_AXIS_STRING = "x";
-STR_String KX_CameraActuator::Y_AXIS_STRING = "y";
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
@@ -353,15 +350,6 @@
 	return NULL;
 }
 
-bool KX_CameraActuator::string2axischoice(const char *axisString) 
-{
-	bool res = true;
-
-	res = !(axisString == Y_AXIS_STRING);
-
-	return res;
-}
-
 /* ------------------------------------------------------------------------- */
 /* Python functions                                                          */
 /* ------------------------------------------------------------------------- */

Modified: branches/blender2.5/blender/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/Ketsji/KX_GameObject.cpp	2009-08-19 10:19:40 UTC (rev 22628)
+++ branches/blender2.5/blender/source/gameengine/Ketsji/KX_GameObject.cpp	2009-08-19 10:26:43 UTC (rev 22629)
@@ -464,7 +464,7 @@
 	double* fl = GetOpenGLMatrixPtr()->getPointer();
 
 	SG_QList::iterator<RAS_MeshSlot> mit(m_meshSlots);
-	RAS_MeshSlot* ms;
+//	RAS_MeshSlot* ms;
 	for(mit.begin(); !mit.end(); ++mit)
 	{
 		(*mit)->m_OpenGLMatrix = fl;
@@ -1817,10 +1817,10 @@
 
 PyObject* KX_GameObject::pyattr_get_worldPosition(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
-	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 #ifdef USE_MATHUTILS
 	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_POS_GLOBAL);
 #else
+	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	return PyObjectFrom(self->NodeGetWorldPosition());
 #endif
 }
@@ -1839,10 +1839,10 @@
 
 PyObject* KX_GameObject::pyattr_get_localPosition(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
-	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 #ifdef USE_MATHUTILS	
 	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_POS_LOCAL);
 #else	
+	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	return PyObjectFrom(self->NodeGetLocalPosition());
 #endif
 }
@@ -1861,10 +1861,10 @@
 
 PyObject* KX_GameObject::pyattr_get_localInertia(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
-	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 #ifdef USE_MATHUTILS
 	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_INERTIA_LOCAL);
 #else
+	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	if (self->GetPhysicsController())
 		return PyObjectFrom(self->GetPhysicsController()->GetLocalInertia());
 	return Py_BuildValue("fff", 0.0f, 0.0f, 0.0f);
@@ -1922,20 +1922,20 @@
 
 PyObject* KX_GameObject::pyattr_get_worldScaling(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
-	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 #ifdef USE_MATHUTILS
 	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_SCALE_GLOBAL);
 #else
+	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	return PyObjectFrom(self->NodeGetWorldScaling());
 #endif
 }
 
 PyObject* KX_GameObject::pyattr_get_localScaling(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef)
 {
-	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 #ifdef USE_MATHUTILS
 	return newVectorObject_cb((PyObject *)self_v, 3, mathutils_kxgameob_vector_cb_index, MATHUTILS_VEC_CB_SCALE_LOCAL);
 #else
+	KX_GameObject* self= static_cast<KX_GameObject*>(self_v);
 	return PyObjectFrom(self->NodeGetLocalScaling());
 #endif
 }

Modified: branches/blender2.5/blender/source/gameengine/Ketsji/KX_IpoActuator.cpp
===================================================================

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list