Merge branch 'blender2.8' into hair_guideshair_guides

1 files changed, 9 insertions, 6 deletions

diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index cfbc96696d6..0ccdd3cf5c6 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -2440,9 +2440,9 @@ class WM_OT_studiolight_install(Operator):
     )
     orientation: EnumProperty(
         items=(
-            ("MATCAP", "MatCap", ""),
-            ("WORLD", "World", ""),
-            ("CAMERA", "Camera", ""),
+            ('MATCAP', "MatCap", ""),
+            ('WORLD', "World", ""),
+            ('CAMERA', "Camera", ""),
         )
     )
 
@@ -2499,9 +2499,12 @@ class WM_OT_studiolight_uninstall(Operator):
         userpref = context.user_preferences
         for studio_light in userpref.studio_lights:
             if studio_light.index == self.index:
-                self._remove_path(pathlib.Path(studio_light.path))
-                self._remove_path(pathlib.Path(studio_light.path_irr_cache))
-                self._remove_path(pathlib.Path(studio_light.path_sh_cache))
+                if len(studio_light.path) > 0:
+                    self._remove_path(pathlib.Path(studio_light.path))
+                if len(studio_light.path_irr_cache) > 0:
+                    self._remove_path(pathlib.Path(studio_light.path_irr_cache))
+                if len(studio_light.path_sh_cache) > 0:
+                    self._remove_path(pathlib.Path(studio_light.path_sh_cache))
                 userpref.studio_lights.remove(studio_light)
                 return {'FINISHED'}
         return {'CANCELLED'}