mirror of
https://github.com/overte-org/overte.git
synced 2025-08-12 17:34:03 +02:00
Merge pull request #15178 from amantley/fbxJointParentBug
Fix for FBX Root Being Given Non-Zero Parent
This commit is contained in:
commit
53c7ade542
1 changed files with 8 additions and 2 deletions
|
@ -1164,11 +1164,17 @@ HFMModel* FBXSerializer::extractHFMModel(const hifi::VariantHash& mapping, const
|
||||||
counter++;
|
counter++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (_connectionParentMap.value(getID(connection.properties, 1)) == "0") {
|
||||||
|
// don't assign the new parent
|
||||||
|
qCDebug(modelformat) << "root node " << getID(connection.properties, 1) << " has discarded parent " << getID(connection.properties, 2);
|
||||||
|
_connectionChildMap.insert(getID(connection.properties, 2), getID(connection.properties, 1));
|
||||||
|
} else {
|
||||||
_connectionParentMap.insert(getID(connection.properties, 1), getID(connection.properties, 2));
|
_connectionParentMap.insert(getID(connection.properties, 1), getID(connection.properties, 2));
|
||||||
_connectionChildMap.insert(getID(connection.properties, 2), getID(connection.properties, 1));
|
_connectionChildMap.insert(getID(connection.properties, 2), getID(connection.properties, 1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
#if defined(DEBUG_FBXSERIALIZER)
|
#if defined(DEBUG_FBXSERIALIZER)
|
||||||
else {
|
else {
|
||||||
QString objectname = child.name.data();
|
QString objectname = child.name.data();
|
||||||
|
|
Loading…
Reference in a new issue