History

Merge branch 'master' into tony/lean-threshold

Anthony J. Thibault committed 11 years ago

Commit a9848cd2 parents 9ce43a5 ec9bf0747 files · +805 −825Browse files

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

Unified · Split

interface/src/avatar/SkeletonModel.cpp+0−2
@@ -653,8 +653,6 @@ void SkeletonModel::computeBoundingShape() { · 652 unmodified lines
653653 }
654654
655655 void SkeletonModel::renderBoundingCollisionShapes(gpu::Batch& batch, float alpha) {
656− const int BALL_SUBDIVISIONS = 10;
657−
658656 auto geometryCache = DependencyManager::get<GeometryCache>();
659657 auto deferredLighting = DependencyManager::get<DeferredLightingEffect>();
660658 // draw a blue sphere at the capsule top point

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