diff options
author | Erwin Coumans <blender@erwincoumans.com> | 2005-12-31 10:20:08 +0300 |
---|---|---|
committer | Erwin Coumans <blender@erwincoumans.com> | 2005-12-31 10:20:08 +0300 |
commit | 9119b6e8a547303ce9a7ccd3a00636153b53cb0e (patch) | |
tree | 1816973e2baf4888d571e87cfb548cafafe46d41 /source/gameengine/Converter/BL_SkinDeformer.h | |
parent | 625c553e2077ec0a252ddd934d4267c61011d61f (diff) |
Fixed several bugs: python refcounting related and Bullet related (basic add/remove object support, bounding volume hierarchy). Added a few files, updated the Bullet scons. Vc6/7 Bullet projectfiles need to add a couple of files: 'Bullet/CollisionShapes/BvhTriangleMeshShape.cpp',
'Bullet/CollisionShapes/ConvexTriangleCallback.cpp',
'Bullet/CollisionShapes/EmptyShape.cpp',
'Bullet/CollisionShapes/OptimizedBvh.cpp',
'Bullet/CollisionShapes/TriangleCallback.cpp',
'Bullet/CollisionShapes/TriangleIndexVertexArray.cpp',
'Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp'.
Sorry, no armatures fix yet.
Diffstat (limited to 'source/gameengine/Converter/BL_SkinDeformer.h')
-rw-r--r-- | source/gameengine/Converter/BL_SkinDeformer.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source/gameengine/Converter/BL_SkinDeformer.h b/source/gameengine/Converter/BL_SkinDeformer.h index a61ebf59b22..49c69298336 100644 --- a/source/gameengine/Converter/BL_SkinDeformer.h +++ b/source/gameengine/Converter/BL_SkinDeformer.h @@ -63,9 +63,10 @@ public: m_armobj=NULL; } void SetArmature (class BL_ArmatureObject *armobj); - BL_SkinDeformer( struct Object *bmeshobj, - class BL_SkinMeshObject *mesh) - :BL_MeshDeformer(bmeshobj, mesh), + + BL_SkinDeformer( struct Object *bmeshobj, + class BL_SkinMeshObject *mesh,struct Object* blenderArmatureObj) + :BL_MeshDeformer(bmeshobj, mesh,blenderArmatureObj), m_armobj(NULL), m_lastUpdate(-1), m_defbase(&bmeshobj->defbase) @@ -85,8 +86,8 @@ public: BL_SkinDeformer( struct Object *bmeshobj_old, struct Object *bmeshobj_new, - class BL_SkinMeshObject *mesh) - :BL_MeshDeformer(bmeshobj_old, mesh), + class BL_SkinMeshObject *mesh,struct Object *bArmatureObj) + :BL_MeshDeformer(bmeshobj_old, mesh,bArmatureObj), m_armobj(NULL), m_lastUpdate(-1), m_defbase(&bmeshobj_old->defbase) |