Cleanup: whitespace
authorCampbell Barton <ideasman42@gmail.com>
Thu, 6 Aug 2015 02:34:19 +0000 (12:34 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 6 Aug 2015 03:03:07 +0000 (13:03 +1000)
source/gameengine/Converter/BL_ActionActuator.cpp
source/gameengine/Converter/BL_ArmatureObject.cpp
source/gameengine/Converter/KX_ConvertControllers.h
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.h
source/gameengine/Ketsji/KX_SteeringActuator.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
source/gameengine/VideoTexture/VideoFFmpeg.h

index d40ba8d11c2784987c57025b9cb739755507377a..d4cfeb2201a162455bd6d4b89c0923b54a46a9f5 100644 (file)
@@ -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),
index fb5055c9912a8e716d7474e582d01999b25e3f7e..74ebdbcf1b5a7d9a1579accae3fe407fcc82b680 100644 (file)
@@ -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.
index 0ec1c3c09b315e7548ab7d3f9eb2e18722f8e9e8..2f93d70a6f92a94c679b0c04a55a4b4bdd126946 100644 (file)
@@ -41,7 +41,7 @@ void BL_ConvertControllers(
        int activeLayerBitInfo,
        bool isInActiveLayer, 
        class KX_BlenderSceneConverter* converter,
-    bool libloading
+       bool libloading
 );
 
 #endif  /* __KX_CONVERTCONTROLLERS_H__ */
index 651df9aebbea67124f7e9cf4d80553c50b60527b..7021d527abb33c77ebc4f5760c97071a47fef4d1 100644 (file)
@@ -1674,10 +1674,11 @@ CListValue* KX_GameObject::GetChildrenRecursive()
 KX_Scene* KX_GameObject::GetScene()
 {
        SG_Node* node = this->GetSGNode();
-    if (node == NULL)
-        // this happens for object in non active layers, rely on static scene then
-        return KX_GetActiveScene();
-    return static_cast<KX_Scene*>(node->GetSGClientInfo());
+       if (node == NULL) {
+               // this happens for object in non active layers, rely on static scene then
+               return KX_GetActiveScene();
+       }
+       return static_cast<KX_Scene*>(node->GetSGClientInfo());
 }
 
 /* ---------------------------------------------------------------------
@@ -4086,11 +4087,11 @@ bool ConvertPythonToGameObject(PyObject *value, KX_GameObject **object, bool py_
                }
        }
        
-       if (    PyObject_TypeCheck(value, &KX_GameObject::Type) ||
-                       PyObject_TypeCheck(value, &KX_LightObject::Type)        ||
-                       PyObject_TypeCheck(value, &KX_Camera::Type)                     ||
-            PyObject_TypeCheck(value, &KX_FontObject::Type) ||
-            PyObject_TypeCheck(value, &KX_NavMeshObject::Type))
+       if (PyObject_TypeCheck(value, &KX_GameObject::Type)     ||
+           PyObject_TypeCheck(value, &KX_LightObject::Type)    ||
+           PyObject_TypeCheck(value, &KX_Camera::Type)                 ||
+           PyObject_TypeCheck(value, &KX_FontObject::Type) ||
+           PyObject_TypeCheck(value, &KX_NavMeshObject::Type))
        {
                *object = static_cast<KX_GameObject*>BGE_PROXY_REF(value);
                
index b4bd8a64f78b16525c8423f177988b7028cd6945..6c9fed5781f37d53ac8aa7782c19c9c04b0caa05 100644 (file)
@@ -257,7 +257,7 @@ public:
        void                    ConvertAndAddScene(const STR_String& scenename,bool overlay);
 
        void                    RemoveScene(const STR_String& scenename);
-    bool                       ReplaceScene(const STR_String& oldscene,const STR_String& newscene);
+       bool                    ReplaceScene(const STR_String& oldscene,const STR_String& newscene);
        void                    SuspendScene(const STR_String& scenename);
        void                    ResumeScene(const STR_String& scenename);
 
index 83597f9125a97e39dc3ef8b93824ef8df367913b..799d214275cde856847f17dd74df53c11ecb4874 100644 (file)
@@ -561,7 +561,7 @@ PyAttributeDef KX_SteeringActuator::Attributes[] = {
        KX_PYATTRIBUTE_RO_FUNCTION("steeringVec", KX_SteeringActuator, pyattr_get_steeringVec),
        KX_PYATTRIBUTE_SHORT_RW("facingMode", 0, 6, true, KX_SteeringActuator, m_facingMode),
        KX_PYATTRIBUTE_INT_RW("pathUpdatePeriod", -1, 100000, true, KX_SteeringActuator, m_pathUpdatePeriod),
-    KX_PYATTRIBUTE_BOOL_RW("lockZVelocity", KX_SteeringActuator, m_lockzvel),
+       KX_PYATTRIBUTE_BOOL_RW("lockZVelocity", KX_SteeringActuator, m_lockzvel),
        { NULL }        //Sentinel
 };
 
index 269cd7dec0aa000ffdae7153134c72a1776a5051..a524899ad2d09e315b9a6d093952604f2d52262a 100644 (file)
@@ -99,9 +99,9 @@ RAS_OpenGLRasterizer::RAS_OpenGLRasterizer(RAS_ICanvas* canvas, int storage)
        m_motionblur(0),
        m_motionblurvalue(-1.0),
        m_usingoverrideshader(false),
-    m_clientobject(NULL),
-    m_auxilaryClientInfo(NULL),
-    m_drawingmode(KX_TEXTURED),
+       m_clientobject(NULL),
+       m_auxilaryClientInfo(NULL),
+       m_drawingmode(KX_TEXTURED),
        m_texco_num(0),
        m_attrib_num(0),
        //m_last_alphablend(GPU_BLEND_SOLID),
index 4834a7cef6d84165405bdcc43d595381be34066e..0a49a0b19bbda983178caedf34e63313d2603656 100644 (file)
@@ -85,8 +85,8 @@ public:
 
        /// release video source
        virtual bool release (void);
-    /// overwrite base refresh to handle fixed image
-    virtual void refresh(void);
+       /// overwrite base refresh to handle fixed image
+       virtual void refresh(void);
        /// play video
        virtual bool play (void);
        /// pause video