Collada: Moved structure definitions for export settings to the exportSettings.h Also make typedefs for import/export structures.

4 files changed, 33 insertions, 24 deletions

diff --git a/source/blender/collada/DocumentExporter.h b/source/blender/collada/DocumentExporter.h
index b2d8214212c..1bc4851da3d 100644
--- a/source/blender/collada/DocumentExporter.h
+++ b/source/blender/collada/DocumentExporter.h
@@ -27,7 +27,7 @@
 #ifndef __DOCUMENTEXPORTER_H__
 #define __DOCUMENTEXPORTER_H__
 
-#include "ExportSettings.h"
+#include "collada.h"
 
 extern "C" {
 #include "DNA_customdata_types.h"
diff --git a/source/blender/collada/ExportSettings.h b/source/blender/collada/ExportSettings.h
index 73a101108a9..fa6751bef60 100644
--- a/source/blender/collada/ExportSettings.h
+++ b/source/blender/collada/ExportSettings.h
@@ -27,10 +27,28 @@
 #ifndef __EXPORTSETTINGS_H__
 #define __EXPORTSETTINGS_H__
 
-#include "collada.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "BLI_linklist.h"
+
+typedef enum BC_export_mesh_type {
+	BC_MESH_TYPE_VIEW,
+	BC_MESH_TYPE_RENDER
+} BC_export_mesh_type;
+
+typedef enum BC_export_transformation_type {
+	BC_TRANSFORMATION_TYPE_MATRIX,
+	BC_TRANSFORMATION_TYPE_TRANSROTLOC
+} BC_export_transformation_type;
 
-struct ExportSettings {
-public:
+typedef enum BC_export_texture_type {
+	BC_TEXTURE_TYPE_MAT,
+	BC_TEXTURE_TYPE_UV
+} BC_export_texture_type;
+
+typedef struct ExportSettings {
 	bool apply_modifiers;
 	BC_export_mesh_type export_mesh_type;
 
@@ -58,6 +76,10 @@ public:
 
 	char *filepath;
 	LinkNode *export_set;
-};
+} ExportSettings;
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif
diff --git a/source/blender/collada/ImportSettings.h b/source/blender/collada/ImportSettings.h
index 4a2d4e8046a..fb4277b048f 100644
--- a/source/blender/collada/ImportSettings.h
+++ b/source/blender/collada/ImportSettings.h
@@ -27,10 +27,7 @@
 #ifndef __IMPORTSETTINGS_H__
 #define __IMPORTSETTINGS_H__
 
-#include "collada.h"
-
-struct ImportSettings {
-public:
+typedef struct ImportSettings {
 	bool import_units;
 	bool find_chains;
 	bool auto_connect;
@@ -38,6 +35,6 @@ public:
 	int  min_chain_length;
 	char *filepath;
 	bool keep_bind_info;
-};
+} ImportSettings;
 
 #endif
diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h
index 09b46c1de58..cc975abd198 100644
--- a/source/blender/collada/collada.h
+++ b/source/blender/collada/collada.h
@@ -28,6 +28,10 @@
 #define __COLLADA_H__
 
 #include <stdlib.h>
+
+#include "ImportSettings.h"
+#include "ExportSettings.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -37,20 +41,6 @@ extern "C" {
 #include "BLI_path_util.h"
 #include "RNA_types.h"
 
-typedef enum BC_export_mesh_type {
-	BC_MESH_TYPE_VIEW,
-	BC_MESH_TYPE_RENDER
-} BC_export_mesh_type;
-
-typedef enum BC_export_transformation_type {
-	BC_TRANSFORMATION_TYPE_MATRIX,
-	BC_TRANSFORMATION_TYPE_TRANSROTLOC
-} BC_export_transformation_type;
-
-typedef enum BC_export_texture_type {
-	BC_TEXTURE_TYPE_MAT,
-	BC_TEXTURE_TYPE_UV
-} BC_export_texture_type;
 
 struct EvaluationContext;
 struct bContext;