From 2d63f7dfffa226905a8acd5db6445a514df11b73 Mon Sep 17 00:00:00 2001
From: Ohayon Franck <franck@fl4re.com>
Date: Tue, 26 Apr 2016 18:35:15 +0200
Subject: [PATCH] Fix Merge

---
 COLLADAMaya/src/COLLADAMayaDocumentExporter.cpp | 6 +++---
 COLLADAMaya/src/COLLADAMayaExportOptions.cpp    | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/COLLADAMaya/src/COLLADAMayaDocumentExporter.cpp b/COLLADAMaya/src/COLLADAMayaDocumentExporter.cpp
index be16d07e3..5abd8934c 100644
--- 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
index 060ca2015..23a767663 100644
--- 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;