History

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

Andrzej Kapolka committed 12 years ago

Commit 3b634242 parents 23556f0 de8165c467 files · +1411 −115842Browse files

Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 467 files). Show all

Unified · Split

interface/src/MetavoxelSystem.cpp+1−2
@@ -33,8 +33,7 @@ MetavoxelSystem::MetavoxelSystem() : · 32 unmodified lines
33 33
34void MetavoxelSystem::init() {34void MetavoxelSystem::init() {
35 if (!_program.isLinked()) {35 if (!_program.isLinked()) {
36 switchToResourcesParentIfRequired();36 _program.addShaderFromSourceFile(QGLShader::Vertex, Application::resourcesPath() + "shaders/metavoxel_point.vert");
37 _program.addShaderFromSourceFile(QGLShader::Vertex, "resources/shaders/metavoxel_point.vert");
38 _program.link();37 _program.link();
39 38
40 _pointScaleLocation = _program.uniformLocation("pointScale");39 _pointScaleLocation = _program.uniformLocation("pointScale");