diff options
| author | j.spijker@ultimaker.com <jelle spijker> | 2022-06-29 16:48:04 +0300 |
|---|---|---|
| committer | Jelle Spijker <j.spijker@ultimaker.com> | 2022-06-29 16:48:04 +0300 |
| commit | ed3f342e7f7c42fc859a287cf91da97e743150db (patch) | |
| tree | 690e2316e4a2fd79b7b196b1ab5d8614563c5ada /cura | |
| parent | 2cee093d0bc852e68da3cfb27782771e22bd3774 (diff) | |
Search unsecure when not frozen
Also added share/<dep>/resources releative to sys.executable
Contributes to CURA-9365
Diffstat (limited to 'cura')
| -rwxr-xr-x | cura/CuraApplication.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index fbc208b423..dd67e48c20 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -355,9 +355,14 @@ class CuraApplication(QtApplication): Resources.addSecureSearchPath(os.path.join(self._app_install_dir, "share", "cura", "resources")) if not hasattr(sys, "frozen"): - Resources.addSecureSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources")) - Resources.addSecureSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "..", "resources")) - Resources.addSecureSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "..", "plugins")) + Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources")) + + # local Conan cache + Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "..", "resources")) + Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "..", "plugins")) + + # venv site-packages + Resources.addSearchPath(os.path.join(os.path.dirname(sys.executable), "..", "share", "cura", "resources")) @classmethod def _initializeSettingDefinitions(cls): |