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

Tech ENABLE_GL_IMGUI_SHADERS merged into ENABLE_LEGACY_OPENGL_REMOVAL

Browse source 
Fixed conflicts during rebase with master
This commit is contained in:
enricoturri1966 2022-03-28 14:53:44 +02:00
parent 1a1cf108fc
commit 41541287a1
4 changed files with 21 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -306,9 +306,7 @@ void GLShaderProgram::set_uniform(int id, const Matrix3d& value) const
{
set_uniform(id, (Matrix3f)value.cast<float>());
}
#endif // ENABLE_LEGACY_OPENGL_REMOVAL
#if ENABLE_GL_IMGUI_SHADERS
void GLShaderProgram::set_uniform(int id, const Matrix4f& value) const
{
if (id >= 0)
@ -319,7 +317,7 @@ void GLShaderProgram::set_uniform(int id, const Matrix4d& value) const
{
set_uniform(id, (Matrix4f)value.cast<float>());
}
#endif // ENABLE_GL_IMGUI_SHADERS
#endif // ENABLE_LEGACY_OPENGL_REMOVAL
#if ENABLE_GL_CORE_PROFILE
void GLShaderProgram::set_uniform(int id, const Vec2f& value) const