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/DocumentExporter.cpp | |
| 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/DocumentExporter.cpp')
| -rw-r--r-- | source/blender/collada/DocumentExporter.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/collada/DocumentExporter.cpp b/source/blender/collada/DocumentExporter.cpp index 437cdac974b..04af73f2406 100644 --- a/source/blender/collada/DocumentExporter.cpp +++ b/source/blender/collada/DocumentExporter.cpp @@ -181,6 +181,7 @@ static COLLADABU::NativeString make_temp_filepath(const char *name, const char * // COLLADA allows this through multiple <channel>s in <animation>. // For this to work, we need to know objects that use a certain action. + int DocumentExporter::exportCurrentScene(Scene *sce) { PointerRNA sceneptr, unit_settings; |