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:
authorVilém Duha <vilda.novak@gmail.com>2019-07-14 21:42:47 +0300
committerVilém Duha <vilda.novak@gmail.com>2019-07-14 21:53:09 +0300
commit45e76b59c729f3799f973fa54773c1bb54c512da (patch)
treeaa7e7c34128b108b2f9749a2c495edc077e9e896
parent8b6a5c9b83f65350b69eb6389bf905737204811a (diff)
BlenderKit: UI fixes
fix error when image not yet loaded. Profile info was hidden by accident. Login buttons layout was also not respecting login state.
-rw-r--r--blenderkit/ui.py2
-rw-r--r--blenderkit/ui_panels.py27
2 files changed, 20 insertions, 9 deletions
diff --git a/blenderkit/ui.py b/blenderkit/ui.py
index e57685fd..b7d83dca 100644
--- a/blenderkit/ui.py
+++ b/blenderkit/ui.py
@@ -370,6 +370,8 @@ def draw_tooltip(x, y, text='', author='', img=None, gravatar=None):
texth = line_height * nlines + nameline_height
+ if max(img.size[0], img.size[1]) == 0:
+ return;
isizex = int(512 * scale * img.size[0] / max(img.size[0], img.size[1]))
isizey = int(512 * scale * img.size[1] / max(img.size[0], img.size[1]))
diff --git a/blenderkit/ui_panels.py b/blenderkit/ui_panels.py
index 76ace5b4..615dcc09 100644
--- a/blenderkit/ui_panels.py
+++ b/blenderkit/ui_panels.py
@@ -412,7 +412,9 @@ class VIEW3D_PT_blenderkit_profile(Panel):
if user_preferences.enable_oauth:
draw_login_buttons(layout)
- else:
+
+
+ if user_preferences.api_key != '':
me = bpy.context.window_manager.get('bkit profile')
if me is not None:
me = me['user']
@@ -424,6 +426,7 @@ class VIEW3D_PT_blenderkit_profile(Panel):
layout.label(text='Private assets: %i MiB' % (me['sumPrivateAssetFilesSize']))
if me.get('remainingPrivateQuota') is not None:
layout.label(text='Remaining private storage: %i MiB' % (me['remainingPrivateQuota']))
+
layout.operator("wm.url_open", text="See my uploads",
icon='URL').url = paths.BLENDERKIT_USER_ASSETS
@@ -549,14 +552,20 @@ def draw_login_buttons(layout):
layout.label(text='in progress.')
layout.operator("wm.blenderkit_login_cancel", text="Cancel", icon='CANCEL')
else:
- layout.operator("wm.blenderkit_login", text="Login",
- icon='URL').signup = False
- layout.operator("wm.blenderkit_login", text="Sign up",
- icon='URL').signup = True
-
- if user_preferences.api_key != '':
- layout.operator("wm.blenderkit_logout", text="Logout",
- icon='URL')
+ if user_preferences.api_key == '':
+ layout.operator("wm.blenderkit_login", text="Login",
+ icon='URL').signup = False
+ layout.operator("wm.blenderkit_login", text="Sign up",
+ icon='URL').signup = True
+
+ else:
+ layout.operator("wm.blenderkit_login", text="Login as someone else",
+ icon='URL').signup = False
+ layout.operator("wm.blenderkit_logout", text="Logout",
+ icon='URL')
+
+
+
class VIEW3D_PT_blenderkit_unified(Panel):
bl_category = "BlenderKit"