Fix thumbnail rendering in CLI (#12129)
* Fix thumbnail rendering in CLI * Remove OSMesa context flag * Add stringified error message for glfwInit and glewInit * micro refactor --------- Co-authored-by: SoftFever <softfeverever@gmail.com>
This commit is contained in:
@@ -596,12 +596,12 @@ static GLenum get_index_type(const GLModel::Geometry& data)
|
||||
}
|
||||
}
|
||||
|
||||
void GLModel::render()
|
||||
void GLModel::render(GLShaderProgram* shader)
|
||||
{
|
||||
render(std::make_pair<size_t, size_t>(0, indices_count()));
|
||||
render(std::make_pair<size_t, size_t>(0, indices_count()), shader);
|
||||
}
|
||||
|
||||
void GLModel::render(const std::pair<size_t, size_t>& range)
|
||||
void GLModel::render(const std::pair<size_t, size_t>& range, GLShaderProgram* shader)
|
||||
{
|
||||
if (m_render_disabled)
|
||||
return;
|
||||
@@ -609,7 +609,9 @@ void GLModel::render(const std::pair<size_t, size_t>& range)
|
||||
if (range.second == range.first)
|
||||
return;
|
||||
|
||||
GLShaderProgram* shader = wxGetApp().get_current_shader();
|
||||
if (shader == nullptr && wxApp::GetInstance() != nullptr)
|
||||
shader = wxGetApp().get_current_shader();
|
||||
|
||||
if (shader == nullptr)
|
||||
return;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user