From c2ac0e8217b997528cf72a916ccd348f92ed94c6 Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Tue, 19 Apr 2016 18:11:11 +0200 Subject: [PATCH 1/2] Fix resource paths after Uranium API change Contributes to CURA-1390 --- cura/CuraApplication.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 8579ce7e09..c83da0c071 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -66,9 +66,9 @@ class CuraApplication(QtApplication): Q_ENUMS(ResourceTypes) def __init__(self): - Resources.addSearchPath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura")) + Resources.addSearchPath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura", "resources")) if not hasattr(sys, "frozen"): - Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..")) + Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources")) self._open_file_queue = [] # Files to open when plug-ins are loaded. From 37ba88351a449ae538d0906ab9c42283dd1d78d1 Mon Sep 17 00:00:00 2001 From: Thomas-Karl Pietrowski Date: Tue, 19 Apr 2016 20:24:56 +0200 Subject: [PATCH 2/2] Adding marker for the Nvidia workaround --- cura/CuraApplication.py | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index c83da0c071..2a22b624a9 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -46,6 +46,7 @@ import numpy import copy numpy.seterr(all="ignore") +#WORKAROUND: GITHUB-88 GITHUB-385 GITHUB-612 if platform.system() == "Linux": # Needed for platform.linux_distribution, which is not available on Windows and OSX # For Ubuntu: https://bugs.launchpad.net/ubuntu/+source/python-qt4/+bug/941826 if platform.linux_distribution()[0] in ("Ubuntu", ): # TODO: Needs a "if X11_GFX == 'nvidia'" here. The workaround is only needed on Ubuntu+NVidia drivers. Other drivers are not affected, but fine with this fix.