changes to openspace-data, NH now loaded as separate modules

This commit is contained in:
Michal Marcinkowski
2015-02-23 17:24:03 -05:00
parent ee81579f96
commit 2657d6f254
3 changed files with 2 additions and 3 deletions

View File

@@ -153,7 +153,6 @@ void RenderableModel::render(const RenderData& data)
_programObject->setUniform("_performShading", false);
// Bind texture
ghoul::opengl::TextureUnit unit;
unit.activate();

View File

@@ -96,7 +96,7 @@ void WavefrontGeometry::loadObj(const char *filename){
//copy indices
for (int f = 0; f < shapes[0].mesh.indices.size(); f++) {
_iarray[f] = shapes[0].mesh.indices[f];
_iarray[f] = f;// shapes[0].mesh.indices[f];
}
//shapes[0].mesh.texcoords.resize(2 * _isize);