Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 01:03:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed merge error.

Browse source
This commit is contained in:
Andrzej Kapolka 2013-10-18 14:31:56 -07:00
parent 591cf98821
commit b84a5679dd
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/renderer/FBXReader.cpp
View file

@ -793,7 +793,7 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping)
model.postRotation = glm::mat4_cast(glm::quat(glm::radians(postRotation))) *
glm::translate(-rotationPivot) * glm::translate(scalePivot) *
glm::scale(scale) * glm::translate(-scalePivot);
models.insert(object.properties.at(0).value<qint64>(), model);
models.insert(object.properties.at(0).toString(), model);
} else if (object.name == "Texture") {
foreach (const FBXNode& subobject, object.children) {