Get rid of c++ in blenkernel and modifiers
[blender.git] / source / gameengine / Converter / BL_ArmatureActuator.cpp
index 741f1cf0553d5da763a9690e2430bf0b31a83e26..a56fab31a262c78f3e135a30b37bf06600b4b925 100644 (file)
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
@@ -15,7 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
  * All rights reserved.
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file gameengine/Converter/BL_ArmatureActuator.cpp
+ *  \ingroup bgeconv
+ */
+
+
 #include "DNA_action_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_actuator_types.h"
 #include "BKE_constraint.h"
-#include "BLI_arithb.h"
 #include "BL_ArmatureActuator.h"
 #include "BL_ArmatureObject.h"
+#include "BLI_math.h"
 
 /**
  * This class is the conversion of the Pose channel constraint.
@@ -110,7 +115,7 @@ bool BL_ArmatureActuator::UnlinkObject(SCA_IObject* clientobj)
        return res;
 }
 
-void BL_ArmatureActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map)
+void BL_ArmatureActuator::Relink(CTR_Map<CTR_HashedPtr, void*> *obj_map)
 {
        void **h_obj = (*obj_map)[m_gametarget];
        if (h_obj) {
@@ -175,18 +180,14 @@ bool BL_ArmatureActuator::Update(double curtime, bool frame)
        return result;
 }
 
+#ifdef WITH_PYTHON
+
 /* ------------------------------------------------------------------------- */
 /* Python Integration Hooks                                                                     */
 /* ------------------------------------------------------------------------- */
 
 PyTypeObject BL_ArmatureActuator::Type = {
-#if (PY_VERSION_HEX >= 0x02060000)
        PyVarObject_HEAD_INIT(NULL, 0)
-#else
-       /* python 2.5 and below */
-       PyObject_HEAD_INIT( NULL )  /* required py macro */
-       0,                          /* ob_size */
-#endif
                "BL_ArmatureActuator",
                sizeof(PyObjectPlus_Proxy),
                0,
@@ -261,5 +262,5 @@ PyObject* BL_ArmatureActuator::pyattr_get_constraint(void *self, const struct KX
                return constraint->GetProxy();
 }
 
-
+#endif // WITH_PYTHON