History

Merge pull request #5438 from howard-stearns/rig

Andrew Meadows committed 11 years ago

Commit acfc9072 parents 7916ca9 271311546 files · +1947 −1619Browse files

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

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+1−1
@@ -1700,7 +1700,7 @@ NetworkGeometry::NetworkGeometry(const QUrl& url, const QSharedPointer<NetworkGe · 1699 unmodified lines
17001700 // make the minimal amount of dummy geometry to satisfy Model
17011701 FBXJoint joint = { false, QVector<int>(), -1, 0.0f, 0.0f, glm::vec3(), glm::mat4(), glm::quat(), glm::quat(),
17021702 glm::quat(), glm::mat4(), glm::mat4(), glm::vec3(), glm::vec3(), glm::quat(), glm::quat(),
1703− glm::mat4(), QString(""), glm::vec3(), glm::quat(), SHAPE_TYPE_NONE, false};
1703+ glm::mat4(), QString(""), false};
17041704 _geometry.joints.append(joint);
17051705 _geometry.leftEyeJointIndex = -1;
17061706 _geometry.rightEyeJointIndex = -1;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t