Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaia Clary <gaia.clary@machinimatrix.org>2018-02-28 19:29:56 +0300
committerGaia Clary <gaia.clary@machinimatrix.org>2018-02-28 19:29:56 +0300
commit4a892adac5937fdaa19d0309e5195a83bdb14e72 (patch)
treec99b8fbccb904a59983e82ee3ede24d967dece03 /source/blender/collada/DocumentExporter.h
parente73fe77ac09fdad139447b3a00370203049676fc (diff)
parenta363324f7fbba599522d93c4b20d7ada209967d9 (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/DocumentExporter.h')
-rw-r--r--source/blender/collada/DocumentExporter.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/collada/DocumentExporter.h b/source/blender/collada/DocumentExporter.h
index badf4f5a653..68e1523fbee 100644
--- a/source/blender/collada/DocumentExporter.h
+++ b/source/blender/collada/DocumentExporter.h
@@ -27,10 +27,11 @@
#ifndef __DOCUMENTEXPORTER_H__
#define __DOCUMENTEXPORTER_H__
-#include "ExportSettings.h"
+#include "collada.h"
extern "C" {
#include "DNA_customdata_types.h"
+
}
struct Scene;
@@ -40,6 +41,7 @@ class DocumentExporter
public:
DocumentExporter(EvaluationContext *eval_ctx, const ExportSettings *export_settings);
int exportCurrentScene(Scene *sce);
+
void exportScenes(const char *filename);
private:
const ExportSettings *export_settings;