diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-08-06 05:34:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-06 06:03:07 +0300 |
| commit | 5af7257309f4059be00b3440bfdd04de15b4e889 (patch) | |
| tree | ed7f28587fc217c691a62d411597b3969f24f34b /source/gameengine/Converter | |
| parent | 89edddb26c813478de9f7df9efd52b2e2ca8f6e7 (diff) | |
Cleanup: whitespace
Diffstat (limited to 'source/gameengine/Converter')
| -rw-r--r-- | source/gameengine/Converter/BL_ActionActuator.cpp | 2 | ||||
| -rw-r--r-- | source/gameengine/Converter/BL_ArmatureObject.cpp | 4 | ||||
| -rw-r--r-- | source/gameengine/Converter/KX_ConvertControllers.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp index d40ba8d11c2..d4cfeb2201a 100644 --- a/source/gameengine/Converter/BL_ActionActuator.cpp +++ b/source/gameengine/Converter/BL_ActionActuator.cpp @@ -90,7 +90,7 @@ BL_ActionActuator::BL_ActionActuator(SCA_IObject *gameobj, m_stridelength(stride), m_layer_weight(layer_weight), m_playtype(playtype), - m_blendmode(blend_mode), + m_blendmode(blend_mode), m_priority(priority), m_layer(layer), m_ipo_flags(ipo_flags), diff --git a/source/gameengine/Converter/BL_ArmatureObject.cpp b/source/gameengine/Converter/BL_ArmatureObject.cpp index fb5055c9912..74ebdbcf1b5 100644 --- a/source/gameengine/Converter/BL_ArmatureObject.cpp +++ b/source/gameengine/Converter/BL_ArmatureObject.cpp @@ -233,8 +233,8 @@ BL_ArmatureObject::BL_ArmatureObject( // During object replication ob->data is increase, we decrease it now because we get a copy. id_us_min(&((bArmature *)m_origObjArma->data)->id); m_pose = m_objArma->pose; - // need this to get iTaSC working ok in the BGE - m_pose->flag |= POSE_GAME_ENGINE; + // need this to get iTaSC working ok in the BGE + m_pose->flag |= POSE_GAME_ENGINE; memcpy(m_obmat, m_objArma->obmat, sizeof(m_obmat)); // The side-effect of this method registers this object as "animatable" with the KX_Scene. diff --git a/source/gameengine/Converter/KX_ConvertControllers.h b/source/gameengine/Converter/KX_ConvertControllers.h index 0ec1c3c09b3..2f93d70a6f9 100644 --- a/source/gameengine/Converter/KX_ConvertControllers.h +++ b/source/gameengine/Converter/KX_ConvertControllers.h @@ -41,7 +41,7 @@ void BL_ConvertControllers( int activeLayerBitInfo, bool isInActiveLayer, class KX_BlenderSceneConverter* converter, - bool libloading + bool libloading ); #endif /* __KX_CONVERTCONTROLLERS_H__ */ |