Changeset 9667 for code/trunk/src/orxonox/collisionshapes/CollisionShape.cc
- Timestamp:
- Aug 25, 2013, 9:08:42 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core6 merged: 9552-9554,9556-9574,9577-9579,9585-9593,9596-9612,9626-9662
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/collisionshapes/CollisionShape.cc
r8858 r9667 44 44 namespace orxonox 45 45 { 46 RegisterAbstractClass(CollisionShape).inheritsFrom(Class(BaseObject)).inheritsFrom(Class(Synchronisable)); 46 47 47 48 /** … … 49 50 Constructor. Registers and initializes the object. 50 51 */ 51 CollisionShape::CollisionShape( BaseObject* creator)52 : BaseObject(c reator)53 , Synchronisable(c reator)52 CollisionShape::CollisionShape(Context* context) 53 : BaseObject(context) 54 , Synchronisable(context) 54 55 { 55 56 RegisterObject(CollisionShape);
Note: See TracChangeset
for help on using the changeset viewer.