Solve one more conflict

This commit is contained in:
Malin E
2023-02-01 16:07:42 +01:00
parent 4d9983a867
commit 00e80139a2
@@ -71,12 +71,6 @@ namespace {
GL_COLOR_ATTACHMENT2,
};
constexpr openspace::properties::Property::PropertyInfo EnableAnimationInfo = {
"EnableAnimation",
"Enable Animation",
"Enable or disable the animation for the model if it has any"
};
constexpr std::array<const char*, 11> UniformNames = {
"nLightSources", "lightDirectionsViewSpace", "lightIntensities",
"modelViewTransform", "normalTransform", "projectionTransform",