diff options
| author | Vilém Duha <vilda.novak@gmail.com> | 2019-07-26 13:01:43 +0300 |
|---|---|---|
| committer | Vilém Duha <vilda.novak@gmail.com> | 2019-07-26 13:51:28 +0300 |
| commit | 92830c7e43ae5f701b47bcd07199ca3a7e489377 (patch) | |
| tree | d8ce3558b9f9d529b89c42b61e2db0a61c53a514 /blenderkit/ui_panels.py | |
| parent | 7ecccf12b8ff140d331ef3d45842f8bb0759e03e (diff) | |
BlenderKit: fix oauth failing on some connections. This updates the oauth script to last version, and also ensures the login attempt can be properly canceled when it hangs.
Diffstat (limited to 'blenderkit/ui_panels.py')
| -rw-r--r-- | blenderkit/ui_panels.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/blenderkit/ui_panels.py b/blenderkit/ui_panels.py index 615dcc09..9cd37db4 100644 --- a/blenderkit/ui_panels.py +++ b/blenderkit/ui_panels.py @@ -386,6 +386,10 @@ class VIEW3D_PT_blenderkit_model_properties(Panel): layout.operator('object.blenderkit_bring_to_scene', text='Bring to scene') # layout.operator('object.blenderkit_color_corrector') +def draw_login_progress(layout): + layout.label(text='Login through browser') + layout.label(text='in progress.') + layout.operator("wm.blenderkit_login_cancel", text="Cancel", icon='CANCEL') class VIEW3D_PT_blenderkit_profile(Panel): bl_category = "BlenderKit" @@ -405,9 +409,7 @@ class VIEW3D_PT_blenderkit_profile(Panel): user_preferences = bpy.context.preferences.addons['blenderkit'].preferences if user_preferences.login_attempt: - layout.label(text='Login through browser') - layout.label(text='in progress.') - layout.operator("wm.blenderkit_login_cancel", text="Cancel", icon='CANCEL') + draw_login_progress(layout) return if user_preferences.enable_oauth: @@ -548,9 +550,7 @@ def draw_login_buttons(layout): user_preferences = bpy.context.preferences.addons['blenderkit'].preferences if user_preferences.login_attempt: - layout.label(text='Login through browser') - layout.label(text='in progress.') - layout.operator("wm.blenderkit_login_cancel", text="Cancel", icon='CANCEL') + draw_login_progress(layout) else: if user_preferences.api_key == '': layout.operator("wm.blenderkit_login", text="Login", @@ -596,9 +596,7 @@ class VIEW3D_PT_blenderkit_unified(Panel): w = context.region.width if user_preferences.login_attempt: - layout.label(text='Login through browser') - layout.label(text='in progress.') - layout.operator("wm.blenderkit_login_cancel", text="Cancel", icon='CANCEL') + draw_login_progress(layout) return if len(user_preferences.api_key) < 20 and user_preferences.asset_counter > 20: |