Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-09-16 04:22:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-09-16 04:22:55 +0400
commitbeac985ab7b8c1fb62e102dee74d68fa7f3c192d (patch)
treec930c02676d6c4064def616977363a7573c24670 /source/gameengine/Converter
parent2d6839ce65589a91f183de1304bd900d2278c8b1 (diff)
code cleanup: make local game engine functions static
Diffstat (limited to 'source/gameengine/Converter')
-rw-r--r--source/gameengine/Converter/BL_BlenderDataConversion.cpp46
-rw-r--r--source/gameengine/Converter/BL_SkinDeformer.cpp8
2 files changed, 27 insertions, 27 deletions
diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
index 84ad12477d0..4a8541cd310 100644
--- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp
+++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp
@@ -491,7 +491,7 @@ typedef struct MTF_localLayer {
} MTF_localLayer;
// ------------------------------------
-bool ConvertMaterial(
+static bool ConvertMaterial(
BL_Material *material,
Material *mat,
MTFace* tface,
@@ -1535,14 +1535,14 @@ static void my_get_local_bounds(Object *ob, DerivedMesh *dm, float *center, floa
//////////////////////////////////////////////////////
-void BL_CreateGraphicObjectNew(KX_GameObject* gameobj,
- const MT_Point3& localAabbMin,
- const MT_Point3& localAabbMax,
- KX_Scene* kxscene,
- bool isActive,
- e_PhysicsEngine physics_engine)
+static void BL_CreateGraphicObjectNew(KX_GameObject* gameobj,
+ const MT_Point3& localAabbMin,
+ const MT_Point3& localAabbMax,
+ KX_Scene* kxscene,
+ bool isActive,
+ e_PhysicsEngine physics_engine)
{
- if (gameobj->GetMeshCount() > 0)
+ if (gameobj->GetMeshCount() > 0)
{
switch (physics_engine)
{
@@ -1574,16 +1574,16 @@ void BL_CreateGraphicObjectNew(KX_GameObject* gameobj,
}
}
-void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
- struct Object* blenderobject,
- RAS_MeshObject* meshobj,
- KX_Scene* kxscene,
- int activeLayerBitInfo,
- e_PhysicsEngine physics_engine,
- KX_BlenderSceneConverter *converter,
- bool processCompoundChildren
- )
-
+static void BL_CreatePhysicsObjectNew(KX_GameObject* gameobj,
+ struct Object* blenderobject,
+ RAS_MeshObject* meshobj,
+ KX_Scene* kxscene,
+ int activeLayerBitInfo,
+ e_PhysicsEngine physics_engine,
+ KX_BlenderSceneConverter *converter,
+ bool processCompoundChildren
+ )
+
{
//SYS_SystemHandle syshandle = SYS_GetSystem(); /*unused*/
//int userigidbody = SYS_GetCommandLineInt(syshandle,"norigidbody",0);
@@ -2086,7 +2086,7 @@ struct parentChildLink {
#include "DNA_constraint_types.h"
//XXX #include "BIF_editconstraint.h"
-bPoseChannel *get_active_posechannel2 (Object *ob)
+static bPoseChannel *get_active_posechannel2 (Object *ob)
{
bArmature *arm= (bArmature*)ob->data;
bPoseChannel *pchan;
@@ -2100,7 +2100,7 @@ bPoseChannel *get_active_posechannel2 (Object *ob)
return NULL;
}
-ListBase *get_active_constraints2(Object *ob)
+static ListBase *get_active_constraints2(Object *ob)
{
if (!ob)
return NULL;
@@ -2120,7 +2120,7 @@ ListBase *get_active_constraints2(Object *ob)
}
-void RBJconstraints(Object *ob)//not used
+static void RBJconstraints(Object *ob)//not used
{
ListBase *conlist;
bConstraint *curcon;
@@ -2141,7 +2141,7 @@ void RBJconstraints(Object *ob)//not used
#include "KX_IPhysicsController.h"
#include "PHY_DynamicTypes.h"
-KX_IPhysicsController* getPhId(CListValue* sumolist,STR_String busc) {//not used
+static KX_IPhysicsController* getPhId(CListValue* sumolist,STR_String busc) {//not used
for (int j=0;j<sumolist->GetCount();j++)
{
@@ -2154,7 +2154,7 @@ KX_IPhysicsController* getPhId(CListValue* sumolist,STR_String busc) {//not used
}
-KX_GameObject* getGameOb(STR_String busc,CListValue* sumolist)
+static KX_GameObject* getGameOb(STR_String busc,CListValue* sumolist)
{
for (int j=0;j<sumolist->GetCount();j++)
diff --git a/source/gameengine/Converter/BL_SkinDeformer.cpp b/source/gameengine/Converter/BL_SkinDeformer.cpp
index 47cba81798d..c508623bdb6 100644
--- a/source/gameengine/Converter/BL_SkinDeformer.cpp
+++ b/source/gameengine/Converter/BL_SkinDeformer.cpp
@@ -67,7 +67,7 @@ extern "C"{
#define __NLA_DEFNORMALS
//#undef __NLA_DEFNORMALS
-short get_deformflags(struct Object *bmeshobj)
+static short get_deformflags(struct Object *bmeshobj)
{
short flags = ARM_DEF_VGROUP;
@@ -85,9 +85,9 @@ short get_deformflags(struct Object *bmeshobj)
}
BL_SkinDeformer::BL_SkinDeformer(BL_DeformableGameObject *gameobj,
- struct Object *bmeshobj,
- class RAS_MeshObject *mesh,
- BL_ArmatureObject* arma)
+ struct Object *bmeshobj,
+ class RAS_MeshObject *mesh,
+ BL_ArmatureObject* arma)
: //
BL_MeshDeformer(gameobj, bmeshobj, mesh),
m_armobj(arma),