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

Andrzej Kapolka committed 12 years ago

Commit c1a89512 parents 8d3b012 35606c8123 files · +27716 −1046Browse files

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

Unified · Split

@@ -38,9 +38,6 @@ void MetavoxelSystem::init() { · 37 unmodified lines
38	_program.link();	38	_program.link();
39		39
40	_pointScaleLocation = _program.uniformLocation("pointScale");	40	_pointScaleLocation = _program.uniformLocation("pointScale");
41
42	// let the script cache know to use our common access manager
43	ScriptCache::getInstance()->setNetworkAccessManager(Application::getInstance()->getNetworkAccessManager());
44	}	41	}
45	_buffer.setUsagePattern(QOpenGLBuffer::DynamicDraw);	42	_buffer.setUsagePattern(QOpenGLBuffer::DynamicDraw);
46	_buffer.create();	43	_buffer.create();