From a6a4ceebe45428b8fead85c72a6b5301f86c4d70 Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Fri, 18 Oct 2013 18:03:28 -0700 Subject: [PATCH] Just check the last entry for the type. --- interface/src/renderer/FBXReader.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/interface/src/renderer/FBXReader.cpp b/interface/src/renderer/FBXReader.cpp index 1339e8d7a3..804a19a054 100644 --- a/interface/src/renderer/FBXReader.cpp +++ b/interface/src/renderer/FBXReader.cpp @@ -830,8 +830,7 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping) materials.insert(object.properties.at(0).toString(), material); } else if (object.name == "Deformer") { - if ((object.properties.size() == 3 && object.properties.at(2) == "Cluster") || - (object.properties.size() == 2 && object.properties.at(1) == "Cluster")) { + if (object.properties.last() == "Cluster") { Cluster cluster; foreach (const FBXNode& subobject, object.children) { if (subobject.name == "Indexes") { @@ -847,7 +846,7 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping) } clusters.insert(object.properties.at(0).toString(), cluster); - } else if (object.properties.at(2) == "BlendShapeChannel") { + } else if (object.properties.last() == "BlendShapeChannel") { QByteArray name = object.properties.at(1).toByteArray(); name = name.left(name.indexOf('\0')); if (!blendshapeIndices.contains(name)) {