3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 02:07:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into CURA-5595_add_custom_button_to_menu

Browse source
This commit is contained in:
Aleksei S 2018-08-10 15:51:38 +02:00
commit a1bc2f3ebf
89 changed files with 1210 additions and 436 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cura/CuraApplication.py
View file

@ -229,6 +229,8 @@ class CuraApplication(QtApplication):
self._sidebar_custom_menu_items = [] # type: list # Keeps list of custom menu items for the side bar
self._plugins_loaded = False
# Backups
self._auto_save = None
self._save_data_enabled = True
@ -1609,8 +1611,7 @@ class CuraApplication(QtApplication):
self._currently_loading_files.remove(file_name)
self.fileLoaded.emit(file_name)
arrange_objects_on_load = not self.getPreferences().getValue("cura/use_multi_build_plate")
target_build_plate = self.getMultiBuildPlateModel().activeBuildPlate if arrange_objects_on_load else -1
target_build_plate = self.getMultiBuildPlateModel().activeBuildPlate
root = self.getController().getScene().getRoot()
fixed_nodes = []
@ -1664,7 +1665,7 @@ class CuraApplication(QtApplication):
if not child.getDecorator(ConvexHullDecorator):
child.addDecorator(ConvexHullDecorator())
if file_extension != "3mf" and arrange_objects_on_load:
if file_extension != "3mf":
if node.callDecoration("isSliceable"):
# Only check position if it's not already blatantly obvious that it won't fit.
if node.getBoundingBox() is None or self._volume.getBoundingBox() is None or node.getBoundingBox().width < self._volume.getBoundingBox().width or node.getBoundingBox().depth < self._volume.getBoundingBox().depth: