← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/gameengine/Ketsji/KX_ConvertPhysicsObject.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
72
72
        class KX_GameObject*    m_dynamic_parent;
73
73
        bool    m_isactor;
74
74
        bool    m_sensor;
 
75
        bool    m_character;
75
76
        bool    m_concave;
76
77
        bool    m_isdeformable;
77
78
        bool    m_disableSleeping;
144
145
        struct  KX_ObjectProperties*    objprop);
145
146
 
146
147
 
147
 
#ifdef USE_BULLET
 
148
#ifdef WITH_BULLET
148
149
 
149
150
void    KX_ConvertBulletObject( class   KX_GameObject* gameobj,
150
151
        class   RAS_MeshObject* meshobj,
158
159
bool KX_ReInstanceBulletShapeFromMesh(KX_GameObject *gameobj, KX_GameObject *from_gameobj, RAS_MeshObject* from_meshobj);
159
160
 
160
161
#endif
161
 
#endif //__KX_CONVERTPHYSICSOBJECT_H__
 
162
#endif  /* __KX_CONVERTPHYSICSOBJECT_H__ */