History

Automatically switch to default model if avatar model is skeletonless

David Rowe committed 11 years ago

Commit aad3f1d1 parent 30b77d45 files · +33 −2Browse files

Showing the changes to interface/src/avatar/SkeletonModel.cpp (1 of 5 files). Show all

Unified · Split

interface/src/avatar/SkeletonModel.cpp+5−0
@@ -81,6 +81,8 @@ void SkeletonModel::setJointStates(QVector<JointState> states) { · 80 unmodified lines
81 if (_enableShapes) {81 if (_enableShapes) {
82 buildShapes();82 buildShapes();
83 }83 }
84
85 emit skeletonLoaded();
84}86}
85 87
86const float PALM_PRIORITY = DEFAULT_PRIORITY;88const float PALM_PRIORITY = DEFAULT_PRIORITY;
@@ -1007,3 +1009,6 @@ void SkeletonModel::renderJointCollisionShapes(float alpha) { · 920 unmodified lines
1007 glPopMatrix();1009 glPopMatrix();
1008}1010}
1009 1011
1012bool SkeletonModel::hasSkeleton() {
1013 return isActive() ? _geometry->getFBXGeometry().rootJointIndex != -1 : false;
1014}

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