From 7faa6b379fd818b8af8cf8279ff9f43cbdbb169e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vil=C3=A9m=20Duha?= <vilda.novak@gmail.com>
Date: Sun, 6 Dec 2020 19:14:00 +0100
Subject: [PATCH] BlenderKit: fix possible error when loading preferences.
---
blenderkit/ui_panels.py | 6 +++---
blenderkit/utils.py | 14 +++++++++-----
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/blenderkit/ui_panels.py b/blenderkit/ui_panels.py
index 60e749e5b..abf4fc977 100644
--- a/blenderkit/ui_panels.py
+++ b/blenderkit/ui_panels.py
@@ -468,11 +468,11 @@ class VIEW3D_PT_blenderkit_ratings(Panel):
layout = self.layout
assets = ratings.get_assets_for_rating()
if len(assets) > 0:
- layout.label(text='Help BlenderKit community')
- layout.label(text='by rating these assets:')
+ utils.label_multiline(layout, text='Please help BlenderKit community by rating these assets:')
for a in assets:
- draw_rating_asset(self, context, asset=a)
+ if a.bkit_ratings.rating_work_hours==0:
+ draw_rating_asset(self, context, asset=a)
def draw_login_progress(layout):
diff --git a/blenderkit/utils.py b/blenderkit/utils.py
index 96b547b12..36bf1fc91 100644
--- a/blenderkit/utils.py
+++ b/blenderkit/utils.py
@@ -233,11 +233,15 @@ def load_prefs():
# if user_preferences.api_key == '':
fpath = paths.BLENDERKIT_SETTINGS_FILENAME
if os.path.exists(fpath):
- with open(fpath, 'r') as s:
- prefs = json.load(s)
- user_preferences.api_key = prefs.get('API_key', '')
- user_preferences.global_dir = prefs.get('global_dir', paths.default_global_dict())
- user_preferences.api_key_refresh = prefs.get('API_key_refresh', '')
+ try:
+ with open(fpath, 'r') as s:
+ prefs = json.load(s)
+ user_preferences.api_key = prefs.get('API_key', '')
+ user_preferences.global_dir = prefs.get('global_dir', paths.default_global_dict())
+ user_preferences.api_key_refresh = prefs.get('API_key_refresh', '')
+ except Exception as e:
+ print('failed to read addon preferences.')
+ print(e)
def save_prefs(self, context):
--
GitLab