Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Pick up an upstream/master change that didn't get picked up in a merge of my fork/branch.

Browse source
This commit is contained in:
Howard Stearns 2015-04-30 08:53:19 -07:00
parent 2687a7b038
commit 2da8e1ab30
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/render-utils/src/GeometryCache.cpp
View file

@ -1796,7 +1796,9 @@ NetworkGeometry::NetworkGeometry(const QUrl& url, const QSharedPointer<NetworkGe
if (url.isEmpty()) { if (url.isEmpty()) {
// make the minimal amount of dummy geometry to satisfy Model // make the minimal amount of dummy geometry to satisfy Model
FBXJoint joint = { false, QVector<int>(), -1 }; FBXJoint joint = { false, QVector<int>(), -1, 0.0f, 0.0f, glm::vec3(), glm::mat4(), glm::quat(), glm::quat(),
glm::quat(), glm::mat4(), glm::mat4(), glm::vec3(), glm::vec3(), glm::quat(), glm::quat(),
glm::mat4(), QString(""), glm::vec3(), glm::quat(), SHAPE_TYPE_NONE, false};
_geometry.joints.append(joint); _geometry.joints.append(joint);
_geometry.leftEyeJointIndex = -1; _geometry.leftEyeJointIndex = -1;
_geometry.rightEyeJointIndex = -1; _geometry.rightEyeJointIndex = -1;