[Bf-extensions-cvs] [45e76b59] master: 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.

Vilém Duha noreply at git.blender.org
Sun Jul 14 21:00:57 CEST 2019


Commit: 45e76b59c729f3799f973fa54773c1bb54c512da
Author: Vilém Duha
Date:   Sun Jul 14 20:42:47 2019 +0200
Branches: master
https://developer.blender.org/rBA45e76b59c729f3799f973fa54773c1bb54c512da

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.

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

M	blenderkit/ui.py
M	blenderkit/ui_panels.py

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

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"



More information about the Bf-extensions-cvs mailing list