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

Howard Stearns committed 11 years ago

Commit 2da8e1a1 parent 2687a7b1 file · +3 −1Browse files

Showing the changes to libraries/render-utils/src/GeometryCache.cpp (1 of 1 file). Show all

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+3−1

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