diff --git a/tools/MayaExporter/MayaExporter/Mesh.cpp b/tools/MayaExporter/MayaExporter/Mesh.cpp
index 43b76d55..01737683 100644
--- a/tools/MayaExporter/MayaExporter/Mesh.cpp
+++ b/tools/MayaExporter/MayaExporter/Mesh.cpp
@@ -108,7 +108,6 @@ Mesh MeshClass::GetMeshData(MObjectArray object)
         MFnDependencyNode thisNode(node);
         MPlugArray connections;
         thisNode.findPlug("inMesh").connectedTo(connections, true, true);
-        bool hasSkin = false;
         MPlug weightList, weights;
         MObject weightListObject;
         for (unsigned int i = 0; i < connections.length(); i++) {
@@ -117,7 +116,7 @@ Mesh MeshClass::GetMeshData(MObjectArray object)
                 weightList = skinCluster.findPlug("weightList", &status);
                 weightListObject = weightList.attribute();
                 weights = skinCluster.findPlug("weights");
-                hasSkin = true;
+				newMesh.hasSkin = true;
                 break;
             }
         }
@@ -301,7 +300,8 @@ Mesh MeshClass::GetMeshData(MObjectArray object)
                         thisVertex.Uv[1] = UV[1];
 
                         
-                        if (hasSkin) {
+                        if (newMesh.hasSkin) {
+							thisVertex.useWeights = true;
                             float totalWeight = 0.0f;
                             unsigned int totalBones = 0;
                             MIntArray jointIDs /* ??? */;
@@ -319,7 +319,9 @@ Mesh MeshClass::GetMeshData(MObjectArray object)
                             for (unsigned int i = 0; i < 4; i++) {
                                 thisVertex.BoneWeights[i] = thisVertex.BoneWeights[i] / totalWeight;
                             }
-                        }
+						} else {
+							thisVertex.useWeights = false;
+						}
 
                         //float totalWeight = thisVertex.BoneWeights[0] + thisVertex.BoneWeights[1] + thisVertex.BoneWeights[2] + thisVertex.BoneWeights[3];
                         //if (totalWeight > 0.0001f) {
diff --git a/tools/MayaExporter/MayaExporter/Mesh.h b/tools/MayaExporter/MayaExporter/Mesh.h
index 11f6bcf8..affc4320 100644
--- a/tools/MayaExporter/MayaExporter/Mesh.h
+++ b/tools/MayaExporter/MayaExporter/Mesh.h
@@ -11,6 +11,7 @@
 class VertexLayout : public OutputData
 {
 public:
+	bool useWeights = true;
     float Pos[3]{ 0 };
 	float Normal[3]{ 0 };
 	float Tangent[3]{ 0 };
@@ -26,8 +27,10 @@ public:
         out.write((char*)&Tangent, sizeof(float) * 3);
         out.write((char*)&BiNormal, sizeof(float) * 3);
         out.write((char*)&Uv, sizeof(float) * 2);
-        out.write((char*)&BoneIndices, sizeof(float) * 4);
-        out.write((char*)&BoneWeights, sizeof(float) * 4);
+		if (useWeights) {
+			out.write((char*)&BoneIndices, sizeof(float) * 4);
+			out.write((char*)&BoneWeights, sizeof(float) * 4);
+		}
     }
 
     virtual void WriteASCII(std::ostream& out) const
@@ -37,8 +40,10 @@ public:
         out <<  Tangent[0] << " " << Tangent[1]  << " " << Tangent[2] << endl;
         out <<  BiNormal[0] << " " << BiNormal[1]  << " " << BiNormal[2] << endl;
         out <<  Uv[0] << " " << Uv[1]  << endl;
-        out <<  BoneIndices[0] << " " << BoneIndices[1]  << " " << BoneIndices[2] << " " << BoneIndices[3] << endl;
-        out <<  BoneWeights[0] << " " << BoneWeights[1]  << " " << BoneWeights[2] << " " << BoneWeights[3] << endl;
+		if (useWeights) {
+			out << BoneIndices[0] << " " << BoneIndices[1] << " " << BoneIndices[2] << " " << BoneIndices[3] << endl;
+			out << BoneWeights[0] << " " << BoneWeights[1] << " " << BoneWeights[2] << " " << BoneWeights[3] << endl;
+		}
 
     }
     bool operator==(const VertexLayout& right)
@@ -57,6 +62,7 @@ public:
 
 class Mesh : public OutputData {
 public:
+	bool hasSkin = false;
     unsigned int NumVertices;
     unsigned int NumIndices;
     std::vector<VertexLayout> Vertices;
@@ -64,6 +70,7 @@ public:
 
     virtual void WriteBinary(std::ostream& out)
     {
+		out.write((char*)&hasSkin, sizeof(bool));
         out.write((char*)&NumVertices, sizeof(int));
         out.write((char*)&NumIndices, sizeof(int));
         for (auto aVertex : Vertices) {
@@ -79,6 +86,11 @@ public:
     virtual void WriteASCII(std::ostream& out) const
     {
         out << "New Mesh _ not in binary" << endl;
+		out << "hasSkin: ";
+		if(hasSkin)
+			out << "true" << endl;
+		else
+			out << "false" << endl;
         out << "Number of vertices: " << NumVertices << endl;
         out << "number of indices: " << NumIndices << endl;
         int vertexNumber = 0;