Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVilem Duha <vilem.duha@gmail.com>2019-05-29 16:01:01 +0300
committerVilem Duha <vilem.duha@gmail.com>2019-06-01 19:49:18 +0300
commit85fd48c32cbdb42f81b26bfb81d411d83e0898b0 (patch)
treebef0f8366dbe1aca4953cad20e87051468c36651 /blenderkit/upload.py
parent88d0e75f1f35af1ea208565a6eb187162ed8451b (diff)
BlenderKit: convert all imports to importlib
+ new Oauth script version (finished in next commit) +split login/signup buttons
Diffstat (limited to 'blenderkit/upload.py')
-rw-r--r--blenderkit/upload.py27
1 files changed, 13 insertions, 14 deletions
diff --git a/blenderkit/upload.py b/blenderkit/upload.py
index e3eaae48..4ef80aa8 100644
--- a/blenderkit/upload.py
+++ b/blenderkit/upload.py
@@ -16,19 +16,20 @@
#
# ##### END GPL LICENSE BLOCK #####
+
if "bpy" in locals():
- import imp
-
- imp.reload(asset_inspector)
- imp.reload(paths)
- imp.reload(utils)
- imp.reload(search)
- imp.reload(bg_blender)
- imp.reload(autothumb)
- imp.reload(version_checker)
- imp.reload(ui_panels)
+ from importlib import reload
+
+ asset_inspector = reload(asset_inspector)
+ paths = reload(paths)
+ utils = reload(utils)
+ bg_blender = reload(bg_blender)
+ autothumb = reload(autothumb)
+ version_checker = reload(version_checker)
+ search = reload(searchr)
+ ui_panels = reload(ui_panels)
else:
- from blenderkit import asset_inspector, paths, utils, bg_blender, autothumb, version_checker, search,ui_panels
+ from blenderkit import asset_inspector, paths, utils, bg_blender, autothumb, version_checker, search, ui_panels
import tempfile, os, subprocess, json, re
@@ -504,7 +505,7 @@ def get_upload_location(props):
def check_storage_quota(props):
- if props.is_private =='PUBLIC':
+ if props.is_private == 'PUBLIC':
return True
profile = bpy.context.window_manager.get('bkit profile')
@@ -739,8 +740,6 @@ class ModelUploadOperator(Operator):
' after upload. '
'Click Ok to proceed.')
-
-
def invoke(self, context, event):
props = utils.get_upload_props()