mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-03 01:59:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Solve 1 more conflict

Browse Source
This commit is contained in:
Malin E
2023-02-01 14:57:31 +01:00
parent f490fccee6
commit 4d9983a867
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/base/rendering/renderablemodel.cpp
View File

@@ -65,7 +65,6 @@ namespace {
{ "Color Adding", ColorAddingBlending }
};
<<<<<<< HEAD
const GLenum ColorAttachmentArray[3] = {
GL_COLOR_ATTACHMENT0,
GL_COLOR_ATTACHMENT1,
@@ -80,10 +79,6 @@ namespace {
constexpr std::array<const char*, 11> UniformNames = {
"nLightSources", "lightDirectionsViewSpace", "lightIntensities",
=======
constexpr std::array<const char*, 12> UniformNames = {
"opacity", "nLightSources", "lightDirectionsViewSpace", "lightIntensities",
>>>>>>> master
"modelViewTransform", "normalTransform", "projectionTransform",
"performShading", "ambientIntensity", "diffuseIntensity",
"specularIntensity", "gBufferDepthTexture"