diff options
| author | Enrico Turri <enricoturri@seznam.cz> | 2019-06-10 11:47:23 +0300 |
|---|---|---|
| committer | Enrico Turri <enricoturri@seznam.cz> | 2019-06-10 12:57:42 +0300 |
| commit | c7ba8c4daa5163170a3425874aff43c81071483b (patch) | |
| tree | e632322d4b948cda05d06a08696bb35e095438da /src | |
| parent | 6da1c9813908e3d832d4554506172aea1ebe9f9f (diff) | |
Fixed conflicts after cherry-picking 932e54383d28acbc96f0af6c38c838f2bb23f21d
Diffstat (limited to 'src')
| -rw-r--r-- | src/slic3r/GUI/GLCanvas3D.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp index b8ca905d2..dbfde926c 100644 --- a/src/slic3r/GUI/GLCanvas3D.cpp +++ b/src/slic3r/GUI/GLCanvas3D.cpp @@ -1579,7 +1579,13 @@ void GLCanvas3D::update_volumes_colors_by_extruder() 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; Slic3r::ScopeGuard in_render_guard([this]() { m_in_render = false; }); (void)in_render_guard; |