Merge with latest master

This commit is contained in:
GPayne
2020-02-19 09:25:33 -07:00
parent 79a3b42d06
commit addfa65fa6
230 changed files with 1151 additions and 2270 deletions

View File

@@ -424,7 +424,8 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
if (orientation == Orientation::Inside) {
glCullFace(GL_FRONT);
} else if (orientation == Orientation::Both) {
}
else if (orientation == Orientation::Both) {
glDisable(GL_CULL_FACE);
}
@@ -455,7 +456,8 @@ void RenderableSphere::render(const RenderData& data, RendererTasks&) {
if (orientation == Orientation::Inside) {
glCullFace(GL_BACK);
} else if (orientation == Orientation::Both) {
}
else if (orientation == Orientation::Both) {
glEnable(GL_CULL_FACE);
}
}