3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tech ENABLE_COLOR_CLASSES set as default

Browse source
This commit is contained in:
enricoturri1966 2022-01-14 08:19:00 +01:00
parent fab35e8aa4
commit 6201dad245
50 changed files with 18 additions and 1500 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/slic3r/GUI/GLShader.cpp
View file

@ -4,9 +4,7 @@
#include "3DScene.hpp"
#include "libslic3r/Utils.hpp"
#include "libslic3r/format.hpp"
#if ENABLE_COLOR_CLASSES
#include "libslic3r/Color.hpp"
#endif // ENABLE_COLOR_CLASSES
#include <boost/nowide/fstream.hpp>
#include <GL/glew.h>
@ -309,7 +307,6 @@ void GLShaderProgram::set_uniform(int id, const Vec3d& value) const
set_uniform(id, static_cast<Vec3f>(value.cast<float>()));
}
#if ENABLE_COLOR_CLASSES
void GLShaderProgram::set_uniform(int id, const ColorRGB& value) const
{
set_uniform(id, value.data(), 3);
@ -319,7 +316,6 @@ void GLShaderProgram::set_uniform(int id, const ColorRGBA& value) const
{
set_uniform(id, value.data(), 4);
}
#endif // ENABLE_COLOR_CLASSES
int GLShaderProgram::get_attrib_location(const char* name) const
{