From d790de8706637ff0ff7d260109065b88243e0758 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 19 Jan 2021 13:55:02 +0100 Subject: [PATCH 1/2] Fix loading scripts from all registered resource paths --- plugins/PostProcessingPlugin/PostProcessingPlugin.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.py b/plugins/PostProcessingPlugin/PostProcessingPlugin.py index 075f947622..8968e2c547 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.py +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.py @@ -142,7 +142,9 @@ class PostProcessingPlugin(QObject, Extension): # The PostProcessingPlugin path is for built-in scripts. # The Resources path is where the user should store custom scripts. # The Preferences path is legacy, where the user may previously have stored scripts. - for root in [PluginRegistry.getInstance().getPluginPath("PostProcessingPlugin"), Resources.getStoragePath(Resources.Resources), Resources.getStoragePath(Resources.Preferences)]: + resource_folders = [PluginRegistry.getInstance().getPluginPath("PostProcessingPlugin"), Resources.getStoragePath(Resources.Preferences)] + resource_folders.extend(Resources.getAllPathsForType(Resources.Resources)) + for root in resource_folders: if root is None: continue path = os.path.join(root, "scripts") From 0c9175d7f753ce8fcdb89b4b5150ed3c12488f93 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 15 Feb 2021 11:31:28 +0100 Subject: [PATCH 2/2] Lower camera default position by 70mm The previous default position was aimed at 100mm above the build plate. This is taller than most models that people load into Cura. It's now aimed at 30mm. Models up to 50mm are way more common to print, so this brings it right in the butter zone for most people, hopefully. Fixes #9251. --- cura/CuraApplication.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index e3465e6af5..53dae66715 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -894,14 +894,14 @@ class CuraApplication(QtApplication): diagonal = self.getBuildVolume().getDiagonalSize() if diagonal < 1: #No printer added yet. Set a default camera distance for normal-sized printers. diagonal = 375 - camera.setPosition(Vector(-80, 250, 700) * diagonal / 375) + camera.setPosition(Vector(-80, 180, 700) * diagonal / 375) camera.lookAt(Vector(0, 0, 0)) controller.getScene().setActiveCamera("3d") # Initialize camera tool camera_tool = controller.getTool("CameraTool") if camera_tool: - camera_tool.setOrigin(Vector(0, 100, 0)) + camera_tool.setOrigin(Vector(0, 30, 0)) camera_tool.setZoomRange(0.1, 2000) # Initialize camera animations