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
16#include <glm/gtx/transform.hpp>16#include <glm/gtx/transform.hpp>
17#include <glm/gtx/norm.hpp>17#include <glm/gtx/norm.hpp>
18 18
19#include <CapsuleShape.h>
20#include <GeometryUtil.h>19#include <GeometryUtil.h>
21#include <PathUtils.h>20#include <PathUtils.h>
22#include <PerfStat.h>21#include <PerfStat.h>
23#include <ShapeCollider.h>
24#include <SphereShape.h>
25#include <ViewFrustum.h>22#include <ViewFrustum.h>
26#include <render/Scene.h>23#include <render/Scene.h>
27#include <gpu/Batch.h>24#include <gpu/Batch.h>