History

Merge branch 'master' of https://github.com/highfidelity/hifi into rig

Howard Stearns committed 11 years ago

Commit b6853782 parents 51ed912 569ed4b33 files · +211 −209Browse files

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

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+5−5
@@ -9,22 +9,22 @@ · 8 unmodified lines
99 // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
1010 //
1111
12−// include this before QOpenGLBuffer, which includes an earlier version of OpenGL
12+#include "GeometryCache.h"
13+
1314 #include <cmath>
1415
1516 #include <QNetworkReply>
1617 #include <QRunnable>
1718 #include <QThreadPool>
1819
19−#include <gpu/Batch.h>
20−#include <gpu/GLBackend.h>
21−
2220 #include <FSTReader.h>
2321 #include <NumericalConstants.h>
2422
23+#include <gpu/Batch.h>
24+#include <gpu/GLBackend.h>
25+
2526 #include "TextureCache.h"
2627 #include "RenderUtilsLogging.h"
27−#include "GeometryCache.h"
2828
2929 #include "standardTransformPNTC_vert.h"
3030 #include "standardDrawTexture_frag.h"

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