From 2a5d25e01007e63833612eefbbb4a8f11e4edc20 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Mon, 9 Mar 2015 16:02:07 -0700 Subject: [PATCH] more hacking on mixamo pipeline files --- interface/src/ModelUploader.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/interface/src/ModelUploader.cpp b/interface/src/ModelUploader.cpp index f1c5def149..4093b3e610 100644 --- a/interface/src/ModelUploader.cpp +++ b/interface/src/ModelUploader.cpp @@ -332,8 +332,7 @@ void ModelUploader::populateBasicMapping(QVariantHash& mapping, QString filename // mixamo blendshapes - in the event that a mixamo file was edited by some other tool, it's likely the applicationName will // be rewritten, so we detect the existence of several different blendshapes which indicate we're likely a mixamo file bool likelyMixamoFile = geometry.applicationName == "mixamo.com" || - (geometry.blendshapeChannelNames.contains("Facial_Blends") && - geometry.blendshapeChannelNames.contains("BrowsDown_Right") && + (geometry.blendshapeChannelNames.contains("BrowsDown_Right") && geometry.blendshapeChannelNames.contains("MouthOpen") && geometry.blendshapeChannelNames.contains("Blink_Left") && geometry.blendshapeChannelNames.contains("Blink_Right") &&