Fix Merge

KhronosGroup · Apr 26, 2016 · 2d63f7d · 2d63f7d
1 parent d2e0586
commit 2d63f7d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/COLLADAMaya/src/COLLADAMayaDocumentExporter.cpp b/COLLADAMaya/src/COLLADAMayaDocumentExporter.cpp
@@ -220,9 +220,6 @@ namespace COLLADAMaya
             {
 				// Start by caching the expressions that will be sampled
 				mSceneGraph->sampleAnimationExpressions();
-
-				// Export the LOD
-				mLODExporter->exportLODs();
 
 				if (!ExportOptions::exportAnimations() || ExportOptions::exportPolygonMeshes())
 				{
@@ -264,6 +261,9 @@ namespace COLLADAMaya
 				// Export the geometries
 				mGeometryExporter->exportGeometries();
 
+				// Export the LOD
+				mLODExporter->exportLODs(mVisualSceneExporter);
+
 				bool physicsSceneExported = false;
 				if (ExportOptions::exportPhysics()) {
 					// Export PhysX

diff --git a/COLLADAMaya/src/COLLADAMayaExportOptions.cpp b/COLLADAMaya/src/COLLADAMayaExportOptions.cpp
@@ -85,7 +85,8 @@ namespace COLLADAMaya
         mExportCameras = true;
         mExportMaterialsOnly = false;
         mExportReferencedMaterials = true;
-        mExportJointsAndSkin = true;
+		mExportJoints = true;
+		mExportSkin = true;
         mExportAnimations = true;
 		mExportOptimizedBezierAnimations = false;
         mExportInvisibleNodes = false;