GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 00:55:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jaime van Kessel 2017-05-18 10:49:43 +02:00
commit b16913ec3d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cura/Settings/ExtruderManager.py
View File

@ -151,14 +151,14 @@ class ExtruderManager(QObject):
selected_nodes.append(node) selected_nodes.append(node)
# Then, figure out which nodes are used by those selected nodes. # Then, figure out which nodes are used by those selected nodes.
global_stack = Application.getInstance().getGlobalContainerStack()
current_extruder_trains = self._extruder_trains.get(global_stack.getId())
for node in selected_nodes: for node in selected_nodes:
extruder = node.callDecoration("getActiveExtruder") extruder = node.callDecoration("getActiveExtruder")
if extruder: if extruder:
object_extruders.add(extruder) object_extruders.add(extruder)
else: elif current_extruder_trains:
global_stack = Application.getInstance().getGlobalContainerStack() object_extruders.add(current_extruder_trains["0"].getId())
if global_stack.getId() in self._extruder_trains:
object_extruders.add(self._extruder_trains[global_stack.getId()]["0"].getId())
self._selected_object_extruders = list(object_extruders) self._selected_object_extruders = list(object_extruders)

4
plugins/3MFReader/ThreeMFWorkspaceReader.py
View File

@ -448,13 +448,13 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
container_id = self._stripFileToId(instance_container_file) container_id = self._stripFileToId(instance_container_file)
serialized = archive.open(instance_container_file).read().decode("utf-8") serialized = archive.open(instance_container_file).read().decode("utf-8")
# HACK! we ignore the "metadata/type = quality" instance containers! # HACK! we ignore "quality" and "variant" instance containers!
parser = configparser.ConfigParser() parser = configparser.ConfigParser()
parser.read_string(serialized) parser.read_string(serialized)
if not parser.has_option("metadata", "type"): if not parser.has_option("metadata", "type"):
Logger.log("w", "Cannot find metadata/type in %s, ignoring it", instance_container_file) Logger.log("w", "Cannot find metadata/type in %s, ignoring it", instance_container_file)
continue continue
if parser.get("metadata", "type") == "quality": if parser.get("metadata", "type") in self._ignored_instance_container_types:
continue continue
instance_container = InstanceContainer(container_id) instance_container = InstanceContainer(container_id)