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

Merge branch 'master' of https://github.com/prusa3d/Slic3r

Browse Source
This commit is contained in:
Enrico Turri 2019-05-10 11:45:10 +02:00
commit b55c60125c
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
resources/localization/Slic3rPE.pot
View File

@ -2161,8 +2161,13 @@ msgid "Iso View"
msgstr "" msgstr ""
#. TRN To be shown in the main menu View->Top #. TRN To be shown in the main menu View->Top
#: src/slic3r/GUI/MainFrame.cpp:527
msgctxt "Layers"
msgid "Top"
msgstr ""
#. TRN To be shown in Print Settings "Top solid layers" #. TRN To be shown in Print Settings "Top solid layers"
#: src/slic3r/GUI/MainFrame.cpp:527 src/libslic3r/PrintConfig.cpp:2068 #: src/libslic3r/PrintConfig.cpp:2068
msgid "Top" msgid "Top"
msgstr "" msgstr ""
@ -2171,8 +2176,13 @@ msgid "Top View"
msgstr "" msgstr ""
#. TRN To be shown in the main menu View->Bottom #. TRN To be shown in the main menu View->Bottom
#: src/slic3r/GUI/MainFrame.cpp:529
msgid "Bottom"
msgstr ""
#. TRN To be shown in Print Settings "Bottom solid layers" #. TRN To be shown in Print Settings "Bottom solid layers"
#: src/slic3r/GUI/MainFrame.cpp:529 src/libslic3r/PrintConfig.cpp:150 #: src/libslic3r/PrintConfig.cpp:150
msgctxt "Layers"
msgid "Bottom" msgid "Bottom"
msgstr "" msgstr ""

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

@ -2075,6 +2075,7 @@ void GLCanvas3D::reload_scene(bool refresh_immediately, bool force_full_scene_re
} }
m_gizmos.update_data(*this); m_gizmos.update_data(*this);
m_gizmos.refresh_on_off_state(m_selection);
// Update the toolbar // Update the toolbar
if (update_object_list) if (update_object_list)

15
src/slic3r/GUI/Tab.cpp
View File

@ -2333,7 +2333,20 @@ void TabPrinter::update_pages()
// set m_pages_(technology after changing) to m_pages // set m_pages_(technology after changing) to m_pages
// m_printer_technology will be set by Tab::load_current_preset() // m_printer_technology will be set by Tab::load_current_preset()
if (new_printer_technology == ptFFF) if (new_printer_technology == ptFFF)
m_pages_fff.empty() ? build_fff() : m_pages.swap(m_pages_fff); {
if (m_pages_fff.empty())
{
build_fff();
if (m_extruders_count > 1)
{
m_preset_bundle->update_multi_material_filament_presets();
on_value_change("extruders_count", m_extruders_count);
wxGetApp().sidebar().update_objects_list_extruder_column(m_extruders_count);
}
}
else
m_pages.swap(m_pages_fff);
}
else else
m_pages_sla.empty() ? build_sla() : m_pages.swap(m_pages_sla); m_pages_sla.empty() ? build_sla() : m_pages.swap(m_pages_sla);