Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 22:39:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4397 from ZappoMan/fbxFixes

Browse source 
temporarily remove skeleton check from upload
This commit is contained in:
Brad Hefta-Gaub 2015-03-09 11:01:20 -07:00
commit 5686a4a48d
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/ModelUploader.cpp
View file

@ -178,6 +178,7 @@ bool ModelUploader::zip() {
QByteArray fbxContents = fbx.readAll(); QByteArray fbxContents = fbx.readAll();
FBXGeometry geometry = readFBX(fbxContents, QVariantHash()); FBXGeometry geometry = readFBX(fbxContents, QVariantHash());
#if 0 /// Temporarily remove this check until CtrlAltDavid can come up with a fix.
// Make sure that a skeleton model has a skeleton // Make sure that a skeleton model has a skeleton
if (_modelType == SKELETON_MODEL) { if (_modelType == SKELETON_MODEL) {
if (geometry.rootJointIndex == -1) { if (geometry.rootJointIndex == -1) {
@ -193,6 +194,7 @@ bool ModelUploader::zip() {
return false; return false;
} }
} }
#endif
// make sure we have some basic mappings // make sure we have some basic mappings
populateBasicMapping(mapping, filename, geometry); populateBasicMapping(mapping, filename, geometry);