3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 09:47:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

3DScene mark_volumes_for_layer_height method moved to c++

Browse source
This commit is contained in:
Enrico Turri 2018-05-29 14:34:45 +02:00
parent c3b1eca2c7
commit 5ee5465f94
8 changed files with 53 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

9
xs/src/slic3r/GUI/GLCanvas3DManager.cpp
View file

@ -546,7 +546,7 @@ void GLCanvas3DManager::set_layers_editing_last_action(wxGLCanvas* canvas, unsig
it->second->set_layers_editing_last_action(action);
}
GLShader* GLCanvas3DManager::get_layers_editing_shader(wxGLCanvas* canvas)
const GLShader* GLCanvas3DManager::get_layers_editing_shader(wxGLCanvas* canvas) const
{
CanvasesMap::const_iterator it = _get_canvas(canvas);
return (it != m_canvases.end()) ? it->second->get_layers_editing_shader() : nullptr;
@ -638,13 +638,6 @@ void GLCanvas3DManager::register_on_viewport_changed_callback(wxGLCanvas* canvas
it->second->register_on_viewport_changed_callback(callback);
}
void GLCanvas3DManager::register_on_mark_volumes_for_layer_height_callback(wxGLCanvas* canvas, void* callback)
{
CanvasesMap::iterator it = _get_canvas(canvas);
if (it != m_canvases.end())
it->second->register_on_mark_volumes_for_layer_height_callback(callback);
}
GLCanvas3DManager::CanvasesMap::iterator GLCanvas3DManager::_get_canvas(wxGLCanvas* canvas)
{
return (canvas == nullptr) ? m_canvases.end() : m_canvases.find(canvas);