Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization

This commit is contained in:
ZappoMan 2013-05-08 15:35:09 -07:00
commit 9bde92fe78

View file

@ -7,6 +7,8 @@
#include <QByteArray>
#include <SharedUtil.h>
#include "Camera.h"
#include "Environment.h"
#include "renderer/ProgramObject.h"
@ -14,6 +16,7 @@
#include "world.h"
void Environment::init() {
switchToResourcesParentIfRequired();
_skyFromAtmosphereProgram = createSkyProgram("Atmosphere", _skyFromAtmosphereUniformLocations);
_skyFromSpaceProgram = createSkyProgram("Space", _skyFromSpaceUniformLocations);
}