[Bf-extensions-cvs] [85fd48c3] master: BlenderKit: convert all imports to importlib + new Oauth script version (finished in next commit) +split login/signup buttons
Vilem Duha
noreply at git.blender.org
Sat Jun 1 18:57:22 CEST 2019
Commit: 85fd48c32cbdb42f81b26bfb81d411d83e0898b0
Author: Vilem Duha
Date: Wed May 29 15:01:01 2019 +0200
Branches: master
https://developer.blender.org/rBA85fd48c32cbdb42f81b26bfb81d411d83e0898b0
BlenderKit: convert all imports to importlib
+ new Oauth script version (finished in next commit)
+split login/signup buttons
===================================================================
M blenderkit/__init__.py
M blenderkit/append_link.py
M blenderkit/asset_inspector.py
M blenderkit/autothumb.py
M blenderkit/autothumb_material_bg.py
M blenderkit/autothumb_model_bg.py
M blenderkit/bg_blender.py
M blenderkit/bkit_oauth.py
M blenderkit/categories.py
M blenderkit/download.py
M blenderkit/oauth.py
M blenderkit/overrides.py
M blenderkit/paths.py
M blenderkit/ratings.py
M blenderkit/search.py
M blenderkit/tasks_queue.py
M blenderkit/ui.py
M blenderkit/ui_panels.py
M blenderkit/upload.py
M blenderkit/upload_bg.py
M blenderkit/utils.py
M blenderkit/version_checker.py
===================================================================
diff --git a/blenderkit/__init__.py b/blenderkit/__init__.py
index 579c3896..33fdc15a 100644
--- a/blenderkit/__init__.py
+++ b/blenderkit/__init__.py
@@ -30,19 +30,23 @@ bl_info = {
}
if "bpy" in locals():
- import importlib
-
- importlib.reload(asset_inspector)
- importlib.reload(search)
- importlib.reload(download)
- importlib.reload(ratings)
- importlib.reload(autothumb)
- importlib.reload(ui)
- importlib.reload(bg_blender)
- importlib.reload(paths)
- importlib.reload(utils)
- importlib.reload(bkit_oauth)
- importlib.reload(tasks_queue)
+ from importlib import reload
+
+ asset_inspector = reload(asset_inspector)
+ search = reload(search)
+ download = reload(download)
+ upload = reload(upload)
+ ratings = reload(ratings)
+ autothumb = reload(autothumb)
+ ui = reload(ui)
+ bg_blender = reload(bg_blender)
+ paths = reload(paths)
+ utils = reload(utils)
+ overrides = reload(overrides)
+ ui_panels = reload(ui_panels)
+ categories = reload(categories)
+ bkit_oauth = reload(bkit_oauth)
+ tasks_queue = reload(tasks_queue)
else:
from blenderkit import asset_inspector, search, download, upload, ratings, autothumb, ui, bg_blender, paths, utils, \
overrides, ui_panels, categories, bkit_oauth, tasks_queue
@@ -73,6 +77,7 @@ from bpy.types import (
PropertyGroup,
)
+
# logging.basicConfig(filename = 'blenderkit.log', level = logging.INFO,
# format = ' %(asctime)s:%(filename)s:%(funcName)s:%(lineno)d:%(message)s')
@@ -86,6 +91,7 @@ def scene_load(context):
preferences = bpy.context.preferences.addons['blenderkit'].preferences
preferences.login_attempt = False
+
licenses = (
('royalty_free', 'Royalty Free', 'royalty free commercial license'),
('cc_zero', 'Creative Commons Zero', 'Creative Commons Zero'),
@@ -457,7 +463,7 @@ class BlenderKitCommonUploadProps(object):
('PUBLIC', 'Public', '"Your asset will go into the validation process automatically')
),
description="If not marked private, your asset will go into the validation process automatically\n"
- "Private assets are limited by quota.",
+ "Private assets are limited by quota.",
default="PUBLIC",
)
@@ -1076,7 +1082,7 @@ class BlenderKitModelSearchProps(PropertyGroup, BlenderKitCommonSearchProps):
)
free_only: BoolProperty(name="Free only", description="Show only free models",
- default=False)
+ default=False)
search_advanced: BoolProperty(name="Advanced Search Options", description="use advanced search properties",
default=False)
@@ -1237,7 +1243,7 @@ class BlenderKitAddonPreferences(AddonPreferences):
default_global_dict = paths.default_global_dict()
- enable_oauth = False
+ enable_oauth = True
api_key: StringProperty(
name="BlenderKit API Key",
@@ -1320,12 +1326,11 @@ class BlenderKitAddonPreferences(AddonPreferences):
min=0,
max=20)
- asset_counter: IntProperty(name="Usage Counter",
- description="Counts usages so it asks for registration only after reaching a limit",
- default=0,
- min=0,
- max=20000)
-
+ asset_counter: IntProperty(name="Usage Counter",
+ description="Counts usages so it asks for registration only after reaching a limit",
+ default=0,
+ min=0,
+ max=20000)
# allow_proximity : BoolProperty(
# name="allow proximity data reports",
@@ -1340,8 +1345,7 @@ class BlenderKitAddonPreferences(AddonPreferences):
if self.api_key.strip() == '':
if self.enable_oauth:
- layout.operator("wm.blenderkit_login", text="Login/ Sign up",
- icon='URL')
+ ui_panels.draw_login_buttons(layout)
else:
op = layout.operator("wm.url_open", text="Register online and get your API Key",
icon='QUESTION')
@@ -1438,8 +1442,8 @@ def register():
bpy.app.handlers.load_post.append(scene_load)
-def unregister():
+def unregister():
ui.unregister_ui()
search.unregister_search()
asset_inspector.unregister_asset_inspector()
diff --git a/blenderkit/append_link.py b/blenderkit/append_link.py
index fef0c25f..8b399986 100644
--- a/blenderkit/append_link.py
+++ b/blenderkit/append_link.py
@@ -16,9 +16,16 @@
#
# ##### END GPL LICENSE BLOCK #####
+
+if "bpy" in locals():
+ from importlib import reload
+
+ utils = reload(utils)
+else:
+ from blenderkit import utils
+
import bpy
-import os, uuid
-from blenderkit import utils
+import uuid
def append_brush(file_name, brushname=None, link=False, fake_user=True):
diff --git a/blenderkit/asset_inspector.py b/blenderkit/asset_inspector.py
index 35c4da21..b437a226 100644
--- a/blenderkit/asset_inspector.py
+++ b/blenderkit/asset_inspector.py
@@ -16,18 +16,16 @@
#
# ##### END GPL LICENSE BLOCK #####
+
if "bpy" in locals():
- import imp
+ from importlib import reload
- imp.reload(utils)
+ utils = reload(utils)
else:
from blenderkit import utils
-import bpy, bmesh
-import mathutils
-import object_print3d_utils
+import bpy
from object_print3d_utils import operators as ops
-from mathutils import Vector
RENDER_OBTYPES = ['MESH', 'CURVE', 'SURFACE', 'METABALL', 'TEXT']
@@ -94,7 +92,6 @@ def check_render_engine(props, obs):
props.engine = 'CYCLES'
-
for mname in materials:
m = bpy.data.materials[mname]
if m is not None and m.node_tree is not None:
@@ -315,7 +312,7 @@ def check_modifiers(props, obs):
def get_autotags():
""" call all analysis functions """
ui = bpy.context.scene.blenderkitUI
- if ui.asset_type =='MODEL':
+ if ui.asset_type == 'MODEL':
ob = utils.get_active_model()
obs = utils.get_hierarchy(ob)
props = ob.blenderkit
@@ -339,7 +336,7 @@ def get_autotags():
check_meshprops(props, obs)
check_modifiers(props, obs)
countObs(props, obs)
- elif ui.asset_type =='MATERIAL':
+ elif ui.asset_type == 'MATERIAL':
# reset some properties here, because they might not get re-filled at all when they aren't needed anymore.
mat = utils.get_active_asset()
diff --git a/blenderkit/autothumb.py b/blenderkit/autothumb.py
index 00445629..2d05c5ee 100644
--- a/blenderkit/autothumb.py
+++ b/blenderkit/autothumb.py
@@ -16,17 +16,13 @@
#
# ##### END GPL LICENSE BLOCK #####
-import importlib
if "bpy" in locals():
from importlib import reload
- if "paths" in locals():
- reload(paths)
- if "utils" in locals():
- reload(utils)
- if "bg_blender" in locals():
- reload(bg_blender)
+ paths = reload(paths)
+ utils = reload(utils)
+ bg_blender = reload(bg_blender)
else:
from blenderkit import paths, utils, bg_blender
diff --git a/blenderkit/autothumb_material_bg.py b/blenderkit/autothumb_material_bg.py
index 6d30f0ff..16308433 100644
--- a/blenderkit/autothumb_material_bg.py
+++ b/blenderkit/autothumb_material_bg.py
@@ -16,10 +16,19 @@
#
# ##### END GPL LICENSE BLOCK #####
+
+if "bpy" in locals():
+ from importlib import reload
+
+ utils = reload(utils)
+ append_link = reload(append_link)
+ bg_blender = reload(bg_blender)
+else:
+ from blenderkit import utils, append_link, bg_blender
+
import sys, json, math
import bpy
from pathlib import Path
-from blenderkit import utils, append_link, bg_blender
BLENDERKIT_EXPORT_TEMP_DIR = sys.argv[-1]
BLENDERKIT_THUMBNAIL_PATH = sys.argv[-2]
diff --git a/blenderkit/autothumb_model_bg.py b/blenderkit/autothumb_model_bg.py
index 64f10d83..5df0738b 100644
--- a/blenderkit/autothumb_model_bg.py
+++ b/blenderkit/autothumb_model_bg.py
@@ -17,10 +17,18 @@
# ##### END GPL LICENSE BLOCK #####
+if "bpy" in locals():
+ from importlib import reload
+
+ utils = reload(utils)
+ append_link = reload(append_link)
+ bg_blender = reload(bg_blender)
+else:
+ from blenderkit import utils, append_link, bg_blender
+
import sys, json, math
from pathlib import Path
import bpy
-from blenderkit import utils, append_link, bg_blender
import mathutils
BLENDERKIT_EXPORT_TEMP_DIR = sys.argv[-1]
diff --git a/blenderkit/bg_blender.py b/blenderkit/bg_blender.py
index f1681831..4a7afd92 100644
--- a/blenderkit/bg_blender.py
+++ b/blenderkit/bg_blender.py
@@ -16,6 +16,12 @@
#
# ##### END GPL LICENSE BLOCK #####
+if "bpy" in locals():
+ from importlib import reload
+
+ utils = reload(utils)
+else:
+ from blenderkit import utils
import bpy
import sys, threading, os
@@ -25,8 +31,6 @@ from bpy.props import (
EnumProperty,
)
-from blenderkit import utils
-
bg_processes = []
@@ -112,19 +116,19 @@ def bg_update():
# readthread.
if tcom.error:
estring = tcom.eval_path_computing + ' = False'
- exec (estring)
+ exec(estring)
tcom.lasttext = tcom.outtext
if tcom.outtext != '':
tcom.outtext = ''
estring = tcom.eval_path_state + ' = tcom.lasttext'
- exec (estring)
+ exec(estring)
# print(tcom.lasttext)
if 'finished successfully' in tcom.lasttext:
bg_processes.remove(p)
estring = tcom.eval_path_computing + ' = False'
- exec (estring)
+ exec(estring)
else:
readthread = threading.Thread(target=threadread, args=([tcom]), daemon=True)
readthread.start()
@@ -205,7 +209,7 @@ class KillBgProcess(bpy.types.Operator):
kill = True
if kill:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list