Merge branch 'crunch-submodule' into 'master'

[xonotic/netradiant.git] / contrib / brushexport / export.h

diff --git a/contrib/brushexport/export.h b/contrib/brushexport/export.h
index 76f937b556956e13a0ce88e3516329c8e703024b..e0623dccba30058c0c2848b95567a602cf29de2f 100644 (file)
--- a/contrib/brushexport/export.h
+++ b/contrib/brushexport/export.h
@@ -1,15 +1,16 @@
-#ifndef EXPORT_H\r
-#define EXPORT_H\r
-#include <set>\r
-#include <string>\r
-\r
-enum collapsemode\r
-{\r
-       COLLAPSE_ALL,\r
-       COLLAPSE_BY_MATERIAL,\r
-       COLLAPSE_NONE\r
-};\r
-\r
-bool ExportSelection(const std::set<std::string>& ignorelist, collapsemode m, const std::string& path);\r
-\r
-#endif \r
+#ifndef EXPORT_H
+#define EXPORT_H
+
+#include <set>
+#include <string>
+
+enum collapsemode {
+    COLLAPSE_ALL,
+    COLLAPSE_BY_MATERIAL,
+    COLLAPSE_NONE
+};
+
+bool ExportSelection(const std::set<std::string> &ignorelist, collapsemode m, bool exmat, const std::string &path,
+                     bool limitMatNames, bool objects);
+
+#endif