Merge remote-tracking branch 'origin/havok' into particles

Conflicts: src/Components/Vehicle.h
2014-05-12 15:43:41 +02:00
parent e0b5b72454 2aa51c3e90
commit 457ee84903
34 changed files with 1243 additions and 447 deletions
@@ -0,0 +1,19 @@
+#ifndef Components_MeshShape_h__
+#define Components_MeshShape_h__
+
+#include <string>
+
+#include "Component.h"
+
+namespace Components
+{
+
+struct MeshShape : Component
+{
+	std::string ResourceName;
+
+	virtual MeshShape* Clone() const override { return new MeshShape(*this); }
+};
+
+}
+#endif // !Components_MeshShape_h__