History

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

Brad Davis committed 8 years ago

Commit 6a06bf42 parents b422321 d4571bd188 files · +1191 −774Browse files

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

Unified · Split

libraries/render-utils/src/GeometryCache.cpp+1−1
@@ -31,7 +31,7 @@ · 30 unmodified lines
3131
3232 #include "gpu/StandardShaderLib.h"
3333
34−#include "model/TextureMap.h"
34+#include "graphics/TextureMap.h"
3535 #include "render/Args.h"
3636
3737 #include "standardTransformPNTC_vert.h"