Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Turri <enricoturri@seznam.cz>2019-12-12 15:38:08 +0300
committerEnrico Turri <enricoturri@seznam.cz>2019-12-12 15:38:08 +0300
commitf2b8607d11533399968e3bf9e5522eddaa6ab910 (patch)
treedb85b05d8fc2306fe5f094ada5e36bf72e628cbd /src/slic3r/GUI/3DBed.cpp
parent03fee19fefdbc083b76ed1589f2188ba4efe8866 (diff)
Fixed positioning of gizmos' imgui dialogs
Diffstat (limited to 'src/slic3r/GUI/3DBed.cpp')
-rw-r--r--src/slic3r/GUI/3DBed.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/slic3r/GUI/3DBed.cpp b/src/slic3r/GUI/3DBed.cpp
index dce7c4c99..a0f842d26 100644
--- a/src/slic3r/GUI/3DBed.cpp
+++ b/src/slic3r/GUI/3DBed.cpp
@@ -191,7 +191,6 @@ Bed3D::Bed3D()
: m_type(Custom)
, m_custom_texture("")
, m_custom_model("")
- , m_requires_canvas_update(false)
, m_vbo_id(0)
, m_scale_factor(1.0f)
{
@@ -438,6 +437,7 @@ void Bed3D::render_texture(const std::string& filename, bool bottom, GLCanvas3D&
render_default(bottom);
return;
}
+ canvas.request_extra_frame();
}
// starts generating the main texture, compression will run asynchronously
@@ -457,6 +457,7 @@ void Bed3D::render_texture(const std::string& filename, bool bottom, GLCanvas3D&
render_default(bottom);
return;
}
+ canvas.request_extra_frame();
}
// starts generating the main texture, compression will run asynchronously
@@ -481,13 +482,9 @@ void Bed3D::render_texture(const std::string& filename, bool bottom, GLCanvas3D&
if (m_temp_texture.get_id() != 0)
m_temp_texture.reset();
- m_requires_canvas_update = true;
- }
- else if (m_requires_canvas_update && m_texture.all_compressed_data_sent_to_gpu())
- m_requires_canvas_update = false;
+ canvas.request_extra_frame();
- if (m_texture.all_compressed_data_sent_to_gpu() && canvas.is_keeping_dirty())
- canvas.stop_keeping_dirty();
+ }
if (m_triangles.get_vertices_count() > 0)
{