Requested changes for merging. Part I.

This commit is contained in:
Jonathas Costa
2018-04-20 19:00:00 -04:00
parent cec7d45fed
commit 64d84f3b10
4 changed files with 32 additions and 39 deletions
+1 -1
View File
@@ -187,7 +187,7 @@ void Renderable::setPscUniforms(ghoul::opengl::ProgramObject& program,
program.setUniform("campos", camera.position().vec4());
program.setUniform("objpos", position.vec4());
program.setUniform("camrot", glm::mat4(camera.viewRotationMatrix()));
program.setUniform("scaling", glm::vec2(1, 0));
program.setUniform("scaling", glm::vec2(1.f, 0.f));
}
Renderable::RenderBin Renderable::renderBin() const {