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

Merge branch '4.6' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2020-04-08 16:33:20 +02:00
commit e21262f0b3
No known key found for this signature in database
GPG key ID: 3710727397403C91
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/PlatformPhysics.py
View file

@ -181,7 +181,7 @@ class PlatformPhysics:
if tool.getPluginId() == "TranslateTool": if tool.getPluginId() == "TranslateTool":
for node in Selection.getAllSelectedObjects(): for node in Selection.getAllSelectedObjects():
if node.getBoundingBox().bottom < 0: if node.getBoundingBox() and node.getBoundingBox().bottom < 0:
if not node.getDecorator(ZOffsetDecorator.ZOffsetDecorator): if not node.getDecorator(ZOffsetDecorator.ZOffsetDecorator):
node.addDecorator(ZOffsetDecorator.ZOffsetDecorator()) node.addDecorator(ZOffsetDecorator.ZOffsetDecorator())

2
cura/Settings/ExtruderManager.py
View file

@ -248,6 +248,8 @@ class ExtruderManager(QObject):
extruder_nr = int(global_stack.getProperty(extruder_nr_feature_name, "value")) extruder_nr = int(global_stack.getProperty(extruder_nr_feature_name, "value"))
if extruder_nr == -1: if extruder_nr == -1:
continue continue
if str(extruder_nr) not in self.extruderIds:
extruder_nr = int(self._application.getMachineManager().defaultExtruderPosition)
used_extruder_stack_ids.add(self.extruderIds[str(extruder_nr)]) used_extruder_stack_ids.add(self.extruderIds[str(extruder_nr)])
# Check support extruders # Check support extruders

2
cura_app.py
View file

@ -53,7 +53,7 @@ if with_sentry_sdk:
if ApplicationMetadata.CuraVersion == "master": if ApplicationMetadata.CuraVersion == "master":
sentry_env = "development" # Master is always a development version. sentry_env = "development" # Master is always a development version.
elif ApplicationMetadata.CuraVersion in ["beta", "BETA"]: elif "beta" in ApplicationMetadata.CuraVersion or "BETA" in ApplicationMetadata.CuraVersion:
sentry_env = "beta" sentry_env = "beta"
try: try:
if ApplicationMetadata.CuraVersion.split(".")[2] == "99": if ApplicationMetadata.CuraVersion.split(".")[2] == "99":