merge from 23153 to 23595soc-2009-imbusy

1 files changed, 16 insertions, 25 deletions

diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index 845cead1cdb..41e04eef91c 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -60,8 +60,10 @@ class PHY_IGraphicController;
 class PHY_IPhysicsEnvironment;
 struct Object;
 
+#ifndef DISABLE_PYTHON
 /* utility conversion function */
 bool ConvertPythonToGameObject(PyObject * value, KX_GameObject **object, bool py_none_ok, const char *error_prefix);
+#endif
 
 #ifdef USE_MATHUTILS
 void KX_GameObject_Mathutils_Callback_Init(void);
@@ -114,6 +116,7 @@ public:
 	 */
 	static KX_GameObject* GetClientObject(KX_ClientObjectInfo* info);
 
+#ifndef DISABLE_PYTHON
 	// Python attributes that wont convert into CValue
 	// 
 	// there are 2 places attributes can be stored, in the CValue,
@@ -130,6 +133,7 @@ public:
 	// * when assigning a value, first see if it can be a CValue, if it can remove the "m_attr_dict" and set the CValue
 	// 
 	PyObject*							m_attr_dict; 
+#endif
 
 	virtual void	/* This function should be virtual - derived classed override it */
 	Relink(
@@ -158,6 +162,15 @@ public:
 		return &m_OpenGL_4x4Matrix;
 	};
 
+	/**
+	 * Update the blender object obmat field from the object world position
+	 * if blendobj is NULL, update the object pointed by m_pBlenderObject
+	 * The user must take action to restore the matrix before leaving the GE.
+	 * Used in Armature evaluation
+	 */
+		void
+	UpdateBlenderObjectMatrix(Object* blendobj=NULL);
+
 	/** 
 	 * Get a pointer to the game object that is the parent of 
 	 * this object. Or NULL if there is no parent. The returned
@@ -736,14 +749,6 @@ public:
 	) { return m_bIsNegativeScaling; }
 
 	/**
-	 * Is this a light?
-	 */
-		virtual bool
-	IsLight(
-		void
-	) { return false; }
-
-	/**
 	 * @section Logic bubbling methods.
 	 */
 
@@ -787,7 +792,8 @@ public:
 	
 	CListValue* GetChildren();
 	CListValue* GetChildrenRecursive();
-	
+
+#ifndef DISABLE_PYTHON
 	/**
 	 * @section Python interface functions.
 	 */
@@ -885,22 +891,7 @@ public:
 	/* getitem/setitem */
 	static PyMappingMethods	Mapping;
 	static PySequenceMethods	Sequence;
-	
-private :
-
-	/**	
-	 * Random internal function to convert python function arguments
-	 * to 2 vectors.
-	 * @return true if conversion was possible.
-	 */
-
-		bool						
-	ConvertPythonVectorArgs(
-		PyObject* args,
-		MT_Vector3& pos,
-		MT_Vector3& pos2
-	);	
-
+#endif
 };