Merged with master branch, date of master branch 4/9/2019

This commit is contained in:
Kollberg
2019-09-06 08:14:55 -04:00
421 changed files with 33523 additions and 13408 deletions
+1 -1
View File
@@ -361,7 +361,7 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
glm::mat4(data.camera.combinedViewMatrix() * modelTransform);
_shader->setUniform(_uniformCache.modelViewProjection, modelViewProjection);
glm::mat4 modelViewRotation = glm::mat3(
glm::mat3 modelViewRotation = glm::mat3(
glm::dmat3(data.camera.viewRotationMatrix()) * modelRotation
);
_shader->setUniform(_uniformCache.modelViewRotation, modelViewRotation);