浏览代码

Removed unnecessary checks that may result in false positives rejecting valid models

Max Vollmer 5 年之前
父节点
当前提交
cb55e2658d
共有 1 个文件被更改,包括 17 次插入29 次删除
  1. 17 29
      code/FBX/FBXMeshGeometry.cpp

+ 17 - 29
code/FBX/FBXMeshGeometry.cpp

@@ -448,11 +448,11 @@ void ResolveVertexDataArray(std::vector<T>& data_out, const Scope& source,
         std::vector<T> tempData;
 		ParseVectorDataArray(tempData, GetRequiredElement(source, dataElementName));
 
-		if (tempData.size() != vertex_count) {
-			FBXImporter::LogError(Formatter::format("length of input data unexpected for ByVertice mapping: ")
-								  << tempData.size() << ", expected " << vertex_count);
-			return;
-		}
+        if (tempData.size() != vertex_count) {
+            FBXImporter::LogError(Formatter::format("length of input data unexpected for ByVertice mapping: ")
+                                  << tempData.size() << ", expected " << vertex_count);
+            return;
+        }
 
         data_out.resize(vertex_count);
 		for (size_t i = 0, e = tempData.size(); i < e; ++i) {
@@ -467,22 +467,16 @@ void ResolveVertexDataArray(std::vector<T>& data_out, const Scope& source,
 		std::vector<T> tempData;
 		ParseVectorDataArray(tempData, GetRequiredElement(source, dataElementName));
 
-		if (tempData.size() != vertex_count) {
-			FBXImporter::LogError(Formatter::format("length of input data unexpected for ByVertice mapping: ")
-								  << tempData.size() << ", expected " << vertex_count);
-			return;
-		}
-
         std::vector<int> uvIndices;
         ParseVectorDataArray(uvIndices,GetRequiredElement(source,indexDataElementName));
 
-		if (uvIndices.size() != vertex_count) {
-			FBXImporter::LogError(Formatter::format("length of input data unexpected for ByVertice mapping: ")
-								  << uvIndices.size() << ", expected " << vertex_count);
-			return;
-		}
+        if (uvIndices.size() != vertex_count) {
+            FBXImporter::LogError(Formatter::format("length of input data unexpected for ByVertice mapping: ")
+                                  << uvIndices.size() << ", expected " << vertex_count);
+            return;
+        }
 
-		data_out.resize(vertex_count);
+        data_out.resize(vertex_count);
 
         for (size_t i = 0, e = uvIndices.size(); i < e; ++i) {
 
@@ -512,22 +506,16 @@ void ResolveVertexDataArray(std::vector<T>& data_out, const Scope& source,
 		std::vector<T> tempData;
 		ParseVectorDataArray(tempData, GetRequiredElement(source, dataElementName));
 
-		if (tempData.size() != vertex_count) {
-			FBXImporter::LogError(Formatter::format("length of input data unexpected for ByPolygonVertex mapping: ")
-								  << tempData.size() << ", expected " << vertex_count);
-			return;
-		}
-
         std::vector<int> uvIndices;
         ParseVectorDataArray(uvIndices,GetRequiredElement(source,indexDataElementName));
 
-		if (uvIndices.size() != vertex_count) {
-			FBXImporter::LogError(Formatter::format("length of input data unexpected for ByPolygonVertex mapping: ")
-								  << uvIndices.size() << ", expected " << vertex_count);
-			return;
-		}
+        if (uvIndices.size() != vertex_count) {
+            FBXImporter::LogError(Formatter::format("length of input data unexpected for ByPolygonVertex mapping: ")
+                                  << uvIndices.size() << ", expected " << vertex_count);
+            return;
+        }
 
-		data_out.resize(vertex_count);
+        data_out.resize(vertex_count);
 
         const T empty;
         unsigned int next = 0;