Merge branch 'master' into MoreLanguages

# Conflicts:
#	src/core/Frontend.cpp
#	src/core/MenuScreens.h
#	src/render/Font.cpp
#	src/render/Font.h
#	src/text/Messages.cpp
#	src/text/Text.cpp

1 files changed, 14 insertions, 0 deletions

diff --git a/src/render/Instance.h b/src/render/Instance.h
new file mode 100644
index 00000000..01dfb6a2
--- /dev/null
+++ b/src/render/Instance.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include "Placeable.h"
+
+// unused
+
+class CInstance : public CPlaceable
+{
+public:
+	int m_modelIndex;
+public:
+	~CInstance() = default;
+	void Shutdown();
+};