diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2006-05-11 21:58:23 +0400 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2006-05-11 21:58:23 +0400 |
commit | ede20c166a4fcaedaaf5c5392d00e3a99ecc8ad2 (patch) | |
tree | d3aa15cd27cffd73bb970ea58c898ddc56c21532 /source/gameengine/GameLogic | |
parent | d3dd1da8d429ea72ad42afe4b34692c345ef8c78 (diff) |
- Charlie provided a work-around for some armature related crashes
- fixed some Bullet raycasting (hitfraction was not properly updated for static meshes)
- removed some cvs tags in Bullet's BMF _Font files (they keep on conflicting when duplicated in different repositories)
- set default linearsleepingtreshold explicitly
Diffstat (limited to 'source/gameengine/GameLogic')
-rw-r--r-- | source/gameengine/GameLogic/SCA_IObject.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h index f57201ba59d..aed1d87b929 100644 --- a/source/gameengine/GameLogic/SCA_IObject.h +++ b/source/gameengine/GameLogic/SCA_IObject.h @@ -116,7 +116,13 @@ public: // here come the python forwarded methods virtual PyObject* _getattr(const STR_String& attr); + + virtual int GetGameObjectType() {return -1;} + typedef enum ObjectTypes { + OBJ_ARMATURE=0 + }ObjectTypes; + }; #endif //SCA_IOBJECT_H |