Merge branch 'master' into fix_tests_cura_engine_backend

This commit is contained in:
Ian Paschal 2018-07-06 09:48:07 +02:00 committed by GitHub
commit 75d5828f5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 119 additions and 54 deletions

View file

@ -286,9 +286,11 @@ class FlavorParser:
self._cancelled = False
# We obtain the filament diameter from the selected extruder to calculate line widths
global_stack = CuraApplication.getInstance().getGlobalContainerStack()
if not global_stack:
return None
if global_stack:
self._filament_diameter = global_stack.extruders[str(self._extruder_number)].getProperty("material_diameter", "value")
self._filament_diameter = global_stack.extruders[str(self._extruder_number)].getProperty("material_diameter", "value")
scene_node = CuraSceneNode()