diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-02-28 19:29:56 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-02-28 19:29:56 +0300 |
commit | 4a892adac5937fdaa19d0309e5195a83bdb14e72 (patch) | |
tree | c99b8fbccb904a59983e82ee3ede24d967dece03 /source/blender/collada/ExportSettings.h | |
parent | e73fe77ac09fdad139447b3a00370203049676fc (diff) | |
parent | a363324f7fbba599522d93c4b20d7ada209967d9 (diff) |
merge from master (needed to fix collada headerfiles which have been modified in master and in blender2.8 slightly different)
Diffstat (limited to 'source/blender/collada/ExportSettings.h')
-rw-r--r-- | source/blender/collada/ExportSettings.h | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/source/blender/collada/ExportSettings.h b/source/blender/collada/ExportSettings.h index 620ccedd544..b6a7c1f1b4e 100644 --- a/source/blender/collada/ExportSettings.h +++ b/source/blender/collada/ExportSettings.h @@ -27,11 +27,24 @@ #ifndef __EXPORTSETTINGS_H__ #define __EXPORTSETTINGS_H__ -#include "collada.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 struct ExportSettings { bool apply_modifiers; BC_export_mesh_type export_mesh_type; @@ -59,6 +72,10 @@ public: char *filepath; LinkNode *export_set; -}; +} ExportSettings; + +#ifdef __cplusplus +} +#endif #endif |