[Bf-blender-cvs] [2363430] temp-bge-cleanup: Special cleanup for BL_ArmatureActuator

Porteries Tristan noreply at git.blender.org
Mon May 4 20:42:19 CEST 2015


Commit: 23634309f61c0f9eefe0b7393555b11e29be3982
Author: Porteries Tristan
Date:   Mon May 4 19:47:57 2015 +0200
Branches: temp-bge-cleanup
https://developer.blender.org/rB23634309f61c0f9eefe0b7393555b11e29be3982

Special cleanup for BL_ArmatureActuator

Special cleanup for BL_ArmatureActuator

===================================================================

M	source/gameengine/Converter/BL_ArmatureActuator.cpp
M	source/gameengine/Converter/BL_ArmatureActuator.h

===================================================================

diff --git a/source/gameengine/Converter/BL_ArmatureActuator.cpp b/source/gameengine/Converter/BL_ArmatureActuator.cpp
index 406a278..6941b0e 100644
--- a/source/gameengine/Converter/BL_ArmatureActuator.cpp
+++ b/source/gameengine/Converter/BL_ArmatureActuator.cpp
@@ -54,8 +54,8 @@ BL_ArmatureActuator::BL_ArmatureActuator(SCA_IObject *obj,
                                          KX_GameObject *targetobj,
                                          KX_GameObject *subtargetobj,
                                          float weight,
-                                         float influence) :
-	SCA_IActuator(obj, KX_ACT_ARMATURE),
+                                         float influence)
+	: SCA_IActuator(obj, KX_ACT_ARMATURE),
 	m_constraint(NULL),
 	m_gametarget(targetobj),
 	m_gamesubtarget(subtargetobj),
@@ -100,14 +100,12 @@ void BL_ArmatureActuator::ReParent(SCA_IObject *parent)
 bool BL_ArmatureActuator::UnlinkObject(SCA_IObject *clientobj)
 {
 	bool res = false;
-	if (clientobj == m_gametarget)
-	{
+	if (clientobj == m_gametarget) {
 		// this object is being deleted, we cannot continue to track it.
 		m_gametarget = NULL;
 		res = true;
 	}
-	if (clientobj == m_gamesubtarget)
-	{
+	if (clientobj == m_gamesubtarget) {
 		// this object is being deleted, we cannot continue to track it.
 		m_gamesubtarget = NULL;
 		res = true;
@@ -268,4 +266,3 @@ PyObject *BL_ArmatureActuator::pyattr_get_constraint(void *self, const struct KX
 }
 
 #endif // WITH_PYTHON
-
diff --git a/source/gameengine/Converter/BL_ArmatureActuator.h b/source/gameengine/Converter/BL_ArmatureActuator.h
index 75be2f2..cfa2527 100644
--- a/source/gameengine/Converter/BL_ArmatureActuator.h
+++ b/source/gameengine/Converter/BL_ArmatureActuator.h
@@ -59,11 +59,13 @@ public:
 
 	virtual ~BL_ArmatureActuator();
 
-	virtual CValue *GetReplica() {
+	virtual CValue *GetReplica()
+	{
 		BL_ArmatureActuator *replica = new BL_ArmatureActuator(*this);
 		replica->ProcessReplica();
 		return replica;
-	};
+	}
+
 	virtual void ProcessReplica();
 	virtual bool UnlinkObject(SCA_IObject *clientobj);
 	virtual void Relink(CTR_Map<CTR_HashedPtr, void *> *obj_map);




More information about the Bf-blender-cvs mailing list