[Bf-blender-cvs] [478be344fa7] master: Fix T61246: studiolights (un)install problems

[Philipp Oeser]

Commit: 478be344fa73c7ad6985278e8327a6a01d6609e3
Author: Philipp Oeser
Date:   Wed Feb 6 22:51:29 2019 +0100
Branches: master
https://developer.blender.org/rB478be344fa73c7ad6985278e8327a6a01d6609e3

Fix T61246: studiolights (un)install problems

- studiolights were not installed to their proper subfolder (thus not
recognized on blender restart)
- they were actually loaded with a wrong path which could lead to
deletion of the original source file when uninstalled again

===================================================================

M	release/scripts/startup/bl_operators/wm.py

===================================================================

diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index b9438c275a4..8d663c5b3a5 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -2465,15 +2465,15 @@ class WM_OT_studiolight_install(Operator):
         import shutil
         prefs = context.preferences
 
-        filepaths = [os.path.join(self.directory, e.name) for e in self.files]
-        path_studiolights = bpy.utils.user_resource('DATAFILES', "studiolights", create=True)
+        path_studiolights = os.path.join("studiolights", self.type.lower())
+        path_studiolights = bpy.utils.user_resource('DATAFILES', path_studiolights, create=True)
         if not path_studiolights:
             self.report({'ERROR'}, "Failed to create Studio Light path")
             return {'CANCELLED'}
 
-        for filepath in filepaths:
-            shutil.copy(filepath, path_studiolights)
-            prefs.studio_lights.load(os.path.join(path_studiolights, filepath), self.type)
+        for e in self.files:
+            shutil.copy(os.path.join(self.directory, e.name), path_studiolights)
+            prefs.studio_lights.load(os.path.join(path_studiolights, e.name), self.type)
 
         # print message
         msg = (