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

Fixed conflicts after cherry-picking 932e54383d28acbc96f0af6c38c838f2bb23f21d

Browse Source
This commit is contained in:
Enrico Turri 2019-06-10 10:47:23 +02:00
parent 6da1c98139
commit c7ba8c4daa
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -1579,7 +1579,13 @@ void GLCanvas3D::update_volumes_colors_by_extruder()
void GLCanvas3D::render() void GLCanvas3D::render()
{ {
wxCHECK_RET(!m_in_render, "GLCanvas3D::render() called recursively"); if (m_in_render)
{
// if called recursively, return
m_dirty = true;
return;
}
m_in_render = true; m_in_render = true;
Slic3r::ScopeGuard in_render_guard([this]() { m_in_render = false; }); Slic3r::ScopeGuard in_render_guard([this]() { m_in_render = false; });
(void)in_render_guard; (void)in_render_guard;