History

Merge remote-tracking branch 'upstream/master' into core

Bradley Austin Davis committed 11 years ago

Commit 4f759ee2 parents a2536c7 9af6b0039 files · +315 −2810Browse files

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

Unified · Split

libraries/render-utils/src/Model.cpp+0−3
@@ -16,12 +16,9 @@ · 15 unmodified lines
1616 #include <glm/gtx/transform.hpp>
1717 #include <glm/gtx/norm.hpp>
1818
19−#include <CapsuleShape.h>
2019 #include <GeometryUtil.h>
2120 #include <PathUtils.h>
2221 #include <PerfStat.h>
23−#include <ShapeCollider.h>
24−#include <SphereShape.h>
2522 #include <ViewFrustum.h>
2623 #include <render/Scene.h>
2724 #include <gpu/Batch.h>