[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38837] branches/soc-2011-pepper/source/ gameengine/Ketsji: BGE Animations: Fixing some warnings from GCC about initialization order.

[Mitchell Stokes]

Revision: 38837
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38837
Author:   moguri
Date:     2011-07-29 21:58:31 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
BGE Animations: Fixing some warnings from GCC about initialization order.

Modified Paths:
--------------
    branches/soc-2011-pepper/source/gameengine/Ketsji/BL_Action.cpp
    branches/soc-2011-pepper/source/gameengine/Ketsji/BL_ActionManager.cpp
    branches/soc-2011-pepper/source/gameengine/Ketsji/KX_GameObject.cpp

Modified: branches/soc-2011-pepper/source/gameengine/Ketsji/BL_Action.cpp
===================================================================
--- branches/soc-2011-pepper/source/gameengine/Ketsji/BL_Action.cpp     
2011-07-29 21:47:44 UTC (rev 38836)
+++ branches/soc-2011-pepper/source/gameengine/Ketsji/BL_Action.cpp     
2011-07-29 21:58:31 UTC (rev 38837)
@@ -49,24 +49,24 @@
 
 BL_Action::BL_Action(class KX_GameObject* gameobj)
 :
+       m_action(NULL),
+       m_pose(NULL),
+       m_blendpose(NULL),
+       m_blendinpose(NULL),
+       m_ptrrna(NULL),
+       m_sg_contr(NULL),
        m_obj(gameobj),
        m_startframe(0.f),
        m_endframe(0.f),
-       m_blendin(0.f),
-       m_playmode(0),
        m_endtime(0.f),
        m_localtime(0.f),
+       m_blendin(0.f),
        m_blendframe(0.f),
        m_blendstart(0.f),
        m_speed(0.f),
        m_priority(0),
+       m_playmode(0),
        m_ipo_flags(0),
-       m_pose(NULL),
-       m_blendpose(NULL),
-       m_blendinpose(NULL),
-       m_sg_contr(NULL),
-       m_ptrrna(NULL),
-       m_action(NULL),
        m_done(true)
 {
        if (m_obj->GetGameObjectType() == SCA_IObject::OBJ_ARMATURE)

Modified: branches/soc-2011-pepper/source/gameengine/Ketsji/BL_ActionManager.cpp
===================================================================
--- branches/soc-2011-pepper/source/gameengine/Ketsji/BL_ActionManager.cpp      
2011-07-29 21:47:44 UTC (rev 38836)
+++ branches/soc-2011-pepper/source/gameengine/Ketsji/BL_ActionManager.cpp      
2011-07-29 21:58:31 UTC (rev 38837)
@@ -59,6 +59,8 @@
 {
        if (m_layers[layer])
                return m_layers[layer]->GetAction();
+       
+       return NULL;
 }
 
 bool BL_ActionManager::PlayAction(const char* name,

Modified: branches/soc-2011-pepper/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- branches/soc-2011-pepper/source/gameengine/Ketsji/KX_GameObject.cpp 
2011-07-29 21:47:44 UTC (rev 38836)
+++ branches/soc-2011-pepper/source/gameengine/Ketsji/KX_GameObject.cpp 
2011-07-29 21:58:31 UTC (rev 38837)
@@ -109,8 +109,8 @@
        m_pGraphicController(NULL),
        m_xray(false),
        m_pHitObject(NULL),
-       m_isDeformable(false),
-       m_actionManager(NULL)
+    m_actionManager(NULL),
+       m_isDeformable(false)
 #ifdef WITH_PYTHON
        , m_attr_dict(NULL)
 #endif

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs