History

merge upstream/master into andrew/isentropic

Andrew Meadows committed 11 years ago

Commit be252142 parents a1a1246 6e10ed739 files · +1091 −1362Browse files

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

Unified · Split

interface/src/avatar/SkeletonModel.cpp+0−2
@@ -791,8 +791,6 @@ void SkeletonModel::renderBoundingCollisionShapes(float alpha) { · 790 unmodified lines
791 glPopMatrix();791 glPopMatrix();
792}792}
793 793
794const int BALL_SUBDIVISIONS = 10;
795
796bool SkeletonModel::hasSkeleton() {794bool SkeletonModel::hasSkeleton() {
797 return isActive() ? _geometry->getFBXGeometry().rootJointIndex != -1 : false;795 return isActive() ? _geometry->getFBXGeometry().rootJointIndex != -1 : false;
798}796}

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