After merge fixes
This commit is contained in:
parent
91a1cd30a0
commit
6fcb6afd81
3 changed files with 5 additions and 28 deletions
|
@ -128,12 +128,7 @@ void MeshClipper::render_contour()
|
|||
if (curr_shader != nullptr)
|
||||
curr_shader->stop_using();
|
||||
|
||||
#if ENABLE_GL_SHADERS_ATTRIBUTES
|
||||
GLShaderProgram* shader = wxGetApp().get_shader("flat_attr");
|
||||
#else
|
||||
GLShaderProgram* shader = wxGetApp().get_shader("flat");
|
||||
#endif // ENABLE_GL_SHADERS_ATTRIBUTES
|
||||
|
||||
if (shader != nullptr) {
|
||||
shader->start_using();
|
||||
#if ENABLE_GL_SHADERS_ATTRIBUTES
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue