Merge branch 'master' into master

2019-12-22 09:18:02 +01:00
parent 8a800e7aa5 66750588cf
commit 79aeb65ab4
7 changed files with 159 additions and 141 deletions
--- a/code/M3D/M3DExporter.cpp
+++ b/code/M3D/M3DExporter.cpp
@@ -289,7 +289,7 @@ void ExportSceneM3D(
 // ---------------------------------------------------------------------
 // Worker function for exporting a scene to ASCII A3D.
 // Prototyped and registered in Exporter.cpp
-void ExportSceneA3D(
+void ExportSceneM3DA(
 		const char *pFile,
 		IOSystem *pIOSystem,
 		const aiScene *pScene,