BlenderKit: bring search props to window_manager

this avoids some trouble, e.g. during switching to appended scenes.

13 files changed, 77 insertions, 77 deletions

diff --git a/blenderkit/__init__.py b/blenderkit/__init__.py
index 3fc15f3b..f6fcb155 100644
--- a/blenderkit/__init__.py
+++ b/blenderkit/__init__.py
@@ -143,7 +143,7 @@ from bpy.types import (
 
 @persistent
 def scene_load(context):
-    ui_props = bpy.context.scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     ui_props.assetbar_on = False
     ui_props.turn_off = False
     preferences = bpy.context.preferences.addons['blenderkit'].preferences
@@ -238,7 +238,7 @@ def udate_down_up(self, context):
     """Perform a search if results are empty."""
     s = context.scene
     wm = bpy.context.window_manager
-    props = s.blenderkitUI
+    props = bpy.context.window_manager.blenderkitUI
     if wm.get('search results') == None and props.down_up == 'SEARCH':
         search.search()
 
@@ -246,7 +246,7 @@ def udate_down_up(self, context):
 def switch_search_results(self, context):
     s = bpy.context.scene
     wm = bpy.context.window_manager
-    props = s.blenderkitUI
+    props = bpy.context.window_manager.blenderkitUI
     if props.asset_type == 'MODEL':
         wm['search results'] = wm.get('bkit model search')
         wm['search results orig'] = wm.get('bkit model search orig')
@@ -307,7 +307,7 @@ def asset_type_callback(self, context):
 
 def run_drag_drop_update(self, context):
     if self.drag_init_button:
-        ui_props = bpy.context.scene.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
         # ctx = utils.get_fake_context(bpy.context)
 
         bpy.ops.view3d.close_popup_button('INVOKE_DEFAULT')
@@ -1850,7 +1850,7 @@ def register():
     for cls in classes:
         bpy.utils.register_class(cls)
 
-    bpy.types.Scene.blenderkitUI = PointerProperty(
+    bpy.types.WindowManager.blenderkitUI = PointerProperty(
         type=BlenderKitUIProps)
 
     # MODELS
diff --git a/blenderkit/append_link.py b/blenderkit/append_link.py
index 481504fb..6fe710be 100644
--- a/blenderkit/append_link.py
+++ b/blenderkit/append_link.py
@@ -93,7 +93,7 @@ def append_scene(file_name, scenename=None, link=False, fake_user=False):
     scene['uuid'] = str(uuid.uuid4())
 
     #reset ui_props of the scene to defaults:
-    ui_props = bpy.context.scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     ui_props.down_up = 'SEARCH'
 
     return scene
diff --git a/blenderkit/asset_inspector.py b/blenderkit/asset_inspector.py
index 72b9827d..cbb9517a 100644
--- a/blenderkit/asset_inspector.py
+++ b/blenderkit/asset_inspector.py
@@ -325,7 +325,7 @@ def check_modifiers(props, obs):
 
 def get_autotags():
     """ call all analysis functions """
-    ui = bpy.context.scene.blenderkitUI
+    ui = bpy.context.window_manager.blenderkitUI
     if ui.asset_type == 'MODEL':
         ob = utils.get_active_model()
         obs = utils.get_hierarchy(ob)
diff --git a/blenderkit/autothumb.py b/blenderkit/autothumb.py
index f5e0cd34..2d376852 100644
--- a/blenderkit/autothumb.py
+++ b/blenderkit/autothumb.py
@@ -640,7 +640,7 @@ class ReGenerateMaterialThumbnailOperator(bpy.types.Operator):
 
     def invoke(self, context, event):
         # scene = bpy.context.scene
-        # ui_props = scene.blenderkitUI
+        # ui_props = bpy.context.window_manager.blenderkitUI
         # if ui_props.active_index > -1:
         #     sr = bpy.context.window_manager['search results']
         #     self.asset_data = dict(sr[ui_props.active_index])
diff --git a/blenderkit/bg_blender.py b/blenderkit/bg_blender.py
index 8fa0491f..8495c076 100644
--- a/blenderkit/bg_blender.py
+++ b/blenderkit/bg_blender.py
@@ -232,7 +232,7 @@ class KillBgProcess(bpy.types.Operator):
                     if source.name == bpy.context.scene.name:
                         kill = True
                 if source.bl_rna.name == 'Image' and self.process_source == 'HDR':
-                    ui_props = bpy.context.scene.blenderkitUI
+                    ui_props = bpy.context.window_manager.blenderkitUI
                     if source.name == ui_props.hdr_upload_image.name:
                         kill = False
 
diff --git a/blenderkit/categories.py b/blenderkit/categories.py
index fc7b929b..9a19c120 100644
--- a/blenderkit/categories.py
+++ b/blenderkit/categories.py
@@ -151,7 +151,7 @@ def update_subcategory_enums(self, context):
 
 def get_category_enums(self, context):
     wm = bpy.context.window_manager
-    props = bpy.context.scene.blenderkitUI
+    props = bpy.context.window_manager.blenderkitUI
     asset_type = props.asset_type.lower()
     # asset_type = self.asset_type#get_upload_asset_type(self)
     asset_categories = get_category(wm['bkit_categories'], cat_path=(asset_type,))
@@ -165,7 +165,7 @@ def get_category_enums(self, context):
 
 def get_subcategory_enums(self, context):
     wm = bpy.context.window_manager
-    props = bpy.context.scene.blenderkitUI
+    props = bpy.context.window_manager.blenderkitUI
     asset_type = props.asset_type.lower()
     items = []
     if self.category != '':
@@ -180,7 +180,7 @@ def get_subcategory_enums(self, context):
 
 def get_subcategory1_enums(self, context):
     wm = bpy.context.window_manager
-    props = bpy.context.scene.blenderkitUI
+    props = bpy.context.window_manager.blenderkitUI
     asset_type = props.asset_type.lower()
     items = []
     if self.category != '' and self.subcategory != '':
diff --git a/blenderkit/image_utils.py b/blenderkit/image_utils.py
index 4c09b06a..b17878c3 100644
--- a/blenderkit/image_utils.py
+++ b/blenderkit/image_utils.py
@@ -71,7 +71,7 @@ def set_colorspace(img, colorspace):
 def analyze_image_is_true_hdr(image):
     import numpy
     scene = bpy.context.scene
-    ui_props = scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     size = image.size
     imageWidth = size[0]
     imageHeight = size[1]
@@ -82,7 +82,7 @@ def analyze_image_is_true_hdr(image):
 def generate_hdr_thumbnail():
     import numpy
     scene = bpy.context.scene
-    ui_props = scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     hdr_image = ui_props.hdr_upload_image  # bpy.data.images.get(ui_props.hdr_upload_image)
 
     base, ext = os.path.splitext(hdr_image.filepath)
diff --git a/blenderkit/ratings.py b/blenderkit/ratings.py
index 4bfcfd53..be9719ae 100644
--- a/blenderkit/ratings.py
+++ b/blenderkit/ratings.py
@@ -233,7 +233,7 @@ class FastRateMenu(Operator, ratings_utils.RatingsProperties):
     @classmethod
     def poll(cls, context):
         scene = bpy.context.scene
-        ui_props = scene.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
         return True;
 
     def draw(self, context):
@@ -242,7 +242,7 @@ class FastRateMenu(Operator, ratings_utils.RatingsProperties):
 
     def execute(self, context):
         scene = bpy.context.scene
-        ui_props = scene.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
         #get asset id
         if ui_props.active_index > -1:
             sr = bpy.context.window_manager['search results']
@@ -267,7 +267,7 @@ class FastRateMenu(Operator, ratings_utils.RatingsProperties):
 def rating_menu_draw(self, context):
     layout = self.layout
 
-    ui_props = context.scene.blenderkitUI
+    ui_props = context.window_manager.blenderkitUI
     sr = bpy.context.window_manager['search results']
 
     asset_search_index = ui_props.active_index
diff --git a/blenderkit/search.py b/blenderkit/search.py
index 50c3c480..4938a7b9 100644
--- a/blenderkit/search.py
+++ b/blenderkit/search.py
@@ -375,7 +375,7 @@ def search_timer():
     # finish loading thumbs from queues
     global all_thumbs_loaded
     if not all_thumbs_loaded:
-        ui_props = bpy.context.scene.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
         search_name = f'bkit {ui_props.asset_type.lower()} search'
         wm = bpy.context.window_manager
         if wm.get(search_name) is not None:
@@ -393,7 +393,7 @@ def search_timer():
         return 1.0
     # don't do anything while dragging - this could switch asset during drag, and make results list length different,
     # causing a lot of throuble.
-    if bpy.context.scene.blenderkitUI.dragging:
+    if bpy.context.window_manager.blenderkitUI.dragging:
         # utils.p('end search timer')
 
         return 0.5
@@ -433,7 +433,7 @@ def search_timer():
 
             ok, error = check_errors(rdata)
             if ok:
-                ui_props = bpy.context.scene.blenderkitUI
+                ui_props = bpy.context.window_manager.blenderkitUI
                 orig_len = len(result_field)
 
                 for ri, r in enumerate(rdata['results']):
@@ -490,7 +490,7 @@ def search_timer():
 def load_preview(asset, index):
     scene = bpy.context.scene
     # FIRST START SEARCH
-    props = scene.blenderkitUI
+    props = bpy.context.window_manager.blenderkitUI
     directory = paths.get_temp_dir('%s_search' % props.asset_type.lower())
     s = bpy.context.scene
     results = bpy.context.window_manager.get('search results')
@@ -541,7 +541,7 @@ def load_preview(asset, index):
 def load_previews():
     scene = bpy.context.scene
     # FIRST START SEARCH
-    props = scene.blenderkitUI
+    props = bpy.context.window_manager.blenderkitUI
     directory = paths.get_temp_dir('%s_search' % props.asset_type.lower())
     s = bpy.context.scene
     results = bpy.context.window_manager.get('search results')
@@ -1332,7 +1332,7 @@ def search(category='', get_next=False, author_id=''):
     # mt('start')
     scene = bpy.context.scene
     wm = bpy.context.window_manager
-    ui_props = scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
 
     props = utils.get_search_props()
     if ui_props.asset_type == 'MODEL':
@@ -1423,7 +1423,7 @@ def search(category='', get_next=False, author_id=''):
 
 def update_filters():
     sprops = utils.get_search_props()
-    ui_props = bpy.context.scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     fcommon = sprops.own_only or \
               sprops.search_texture_resolution or \
               sprops.search_file_size or \
@@ -1447,7 +1447,7 @@ def search_update(self, context):
     utils.p('search updater')
     # if self.search_keywords != '':
     update_filters()
-    ui_props = bpy.context.scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     if ui_props.down_up != 'SEARCH':
         ui_props.down_up = 'SEARCH'
 
diff --git a/blenderkit/ui.py b/blenderkit/ui.py
index 2a9c782c..ea0c36a8 100644
--- a/blenderkit/ui.py
+++ b/blenderkit/ui.py
@@ -142,7 +142,7 @@ class Report():
 def get_asset_under_mouse(mousex, mousey):
     s = bpy.context.scene
     wm = bpy.context.window_manager
-    ui_props = bpy.context.scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     r = bpy.context.region
 
     search_results = wm.get('search results')
@@ -166,7 +166,7 @@ def get_asset_under_mouse(mousex, mousey):
 
 
 def draw_bbox(location, rotation, bbox_min, bbox_max, progress=None, color=(0, 1, 0, 1)):
-    ui_props = bpy.context.scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
 
     rotation = mathutils.Euler(rotation)
 
@@ -228,7 +228,7 @@ def get_rating_scalevalues(asset_type):
 
 def draw_ratings_bgl():
     # return;
-    ui = bpy.context.scene.blenderkitUI
+    ui = bpy.context.window_manager.blenderkitUI
 
     rating_possible, rated, asset, asset_data = is_rating_possible()
     if rating_possible:  # (not rated or ui_props.rating_menu_on):
@@ -440,7 +440,7 @@ def draw_callback_2d(self, context):
         go = False
     if go and a == a1 and w == w1:
 
-        props = context.scene.blenderkitUI
+        props = context.window_manager.blenderkitUI
         if props.down_up == 'SEARCH':
             draw_ratings_bgl()
             draw_asset_bar(self, context)
@@ -489,7 +489,7 @@ def draw_callback_2d_progress(self, context):
     offset = 0
     row_height = 35
 
-    ui = bpy.context.scene.blenderkitUI
+    ui = bpy.context.window_manager.blenderkitUI
 
     x = ui.reports_x
     y = ui.reports_y
@@ -536,7 +536,7 @@ def draw_callback_2d_progress(self, context):
 
 
 def draw_callback_2d_upload_preview(self, context):
-    ui_props = context.scene.blenderkitUI
+    ui_props = context.window_manager.blenderkitUI
 
     props = utils.get_upload_props()
 
@@ -576,7 +576,7 @@ def is_upload_old(asset_data):
 def get_large_thumbnail_image(asset_data):
     '''Get thumbnail image from asset data'''
     scene = bpy.context.scene
-    ui_props = scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     iname = utils.previmg_name(ui_props.active_index, fullsize=True)
     directory = paths.get_temp_dir('%s_search' % mappingdict[ui_props.asset_type])
     tpath = os.path.join(directory, asset_data['thumbnail'])
@@ -595,7 +595,7 @@ def get_large_thumbnail_image(asset_data):
 
 def draw_asset_bar(self, context):
     s = bpy.context.scene
-    ui_props = context.scene.blenderkitUI
+    ui_props = context.window_manager.blenderkitUI
     user_preferences = bpy.context.preferences.addons['blenderkit'].preferences
     is_validator = utils.profile_is_validator()
     r = self.region
@@ -887,7 +887,7 @@ def floor_raycast(context, mx, my):
 
 def is_rating_possible():
     ao = bpy.context.active_object
-    ui = bpy.context.scene.blenderkitUI
+    ui = bpy.context.window_manager.blenderkitUI
     preferences = bpy.context.preferences.addons['blenderkit'].preferences
     # first test if user is logged in.
     if preferences.api_key == '':
@@ -932,7 +932,7 @@ def is_rating_possible():
 
 
 def interact_rating(r, mx, my, event):
-    ui = bpy.context.scene.blenderkitUI
+    ui = bpy.context.window_manager.blenderkitUI
     rating_possible, rated, asset, asset_data = is_rating_possible()
     if rating_possible:
         bkit_ratings = asset.bkit_ratings
@@ -966,7 +966,7 @@ def mouse_in_area(mx, my, x, y, w, h):
 
 
 def mouse_in_asset_bar(mx, my):
-    ui_props = bpy.context.scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     # search_results = bpy.context.window_manager.get('search results')
     # if search_results == None:
     #     return False
@@ -992,7 +992,7 @@ def mouse_in_region(r, mx, my):
 def update_ui_size(area, region):
     if bpy.app.background or not area:
         return
-    ui = bpy.context.scene.blenderkitUI
+    ui = bpy.context.window_manager.blenderkitUI
     user_preferences = bpy.context.preferences.addons['blenderkit'].preferences
     ui_scale = bpy.context.preferences.view.ui_scale
 
@@ -1184,7 +1184,7 @@ class AssetBarOperator(bpy.types.Operator):
             bpy.types.SpaceView3D.draw_handler_remove(self._handle_2d, 'WINDOW')
         except:
             pass;
-        ui_props = bpy.context.scene.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
 
         # ui_props.tooltip = ''
         ui_props.active_index = -3
@@ -1196,7 +1196,7 @@ class AssetBarOperator(bpy.types.Operator):
     def modal(self, context, event):
 
         # This is for case of closing the area or changing type:
-        ui_props = context.scene.blenderkitUI
+        ui_props = context.window_manager.blenderkitUI
         user_preferences = bpy.context.preferences.addons['blenderkit'].preferences
 
         areas = []
@@ -1397,7 +1397,7 @@ class AssetBarOperator(bpy.types.Operator):
             mx = event.mouse_region_x
             my = event.mouse_region_y
 
-            ui_props = context.scene.blenderkitUI
+            ui_props = context.window_manager.blenderkitUI
             if event.value == 'PRESS' and ui_props.active_index > -1:
                 # start dragging models and materials
                 bpy.ops.view3d.asset_drag_drop('INVOKE_DEFAULT',
@@ -1468,7 +1468,7 @@ class AssetBarOperator(bpy.types.Operator):
 
     def invoke(self, context, event):
         # FIRST START SEARCH
-        ui_props = context.scene.blenderkitUI
+        ui_props = context.window_manager.blenderkitUI
         sr = bpy.context.window_manager.get('search results')
 
         if self.do_search:
@@ -1596,7 +1596,7 @@ def draw_callback_dragging(self, context):
         return
     linelength = 35
     scene = bpy.context.scene
-    ui_props = scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     ui_bgl.draw_image(self.mouse_x + linelength, self.mouse_y - linelength - ui_props.thumb_size,
                       ui_props.thumb_size, ui_props.thumb_size, img, 1)
     ui_bgl.draw_line2d(self.mouse_x, self.mouse_y, self.mouse_x + linelength,
@@ -1607,7 +1607,7 @@ def draw_callback_3d_dragging(self, context):
     ''' Draw snapped bbox while dragging. '''
     if not utils.guard_from_crash():
         return
-    ui_props = context.scene.blenderkitUI
+    ui_props = context.window_manager.blenderkitUI
     # print(ui_props.asset_type, self.has_hit, self.snapped_location)
     if ui_props.asset_type == 'MODEL':
         if self.has_hit:
@@ -1637,7 +1637,7 @@ class AssetDragOperator(bpy.types.Operator):
 
     def mouse_release(self):
         scene = bpy.context.scene
-        ui_props = scene.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
 
         if ui_props.asset_type == 'MODEL':
             if not self.drag:
@@ -1759,7 +1759,7 @@ class AssetDragOperator(bpy.types.Operator):
 
     def modal(self, context, event):
         scene = bpy.context.scene
-        ui_props = scene.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
         context.area.tag_redraw()
 
         # if event.type == 'MOUSEMOVE':
@@ -1877,7 +1877,7 @@ class AssetDragOperator(bpy.types.Operator):
                                                                      'POST_VIEW')
 
             bpy.context.window.cursor_set("NONE")
-            ui_props = bpy.context.scene.blenderkitUI
+            ui_props = bpy.context.window_manager.blenderkitUI
             ui_props.dragging = True
             self.drag = False
             context.window_manager.modal_handler_add(self)
@@ -1930,7 +1930,7 @@ addon_keymapitems = []
 
 # @persistent
 def pre_load(context):
-    ui_props = bpy.context.scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     ui_props.assetbar_on = False
     ui_props.turn_off = True
     preferences = bpy.context.preferences.addons['blenderkit'].preferences
diff --git a/blenderkit/ui_panels.py b/blenderkit/ui_panels.py
index bddc13f9..6bb2f4d5 100644
--- a/blenderkit/ui_panels.py
+++ b/blenderkit/ui_panels.py
@@ -182,7 +182,7 @@ def prop_needed(layout, props, name, value='', is_not_filled=''):
 
 def draw_panel_hdr_upload(self, context):
     layout = self.layout
-    ui_props = bpy.context.scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
 
     # layout.prop_search(ui_props, "hdr_upload_image", bpy.data, "images")
     layout.prop(ui_props, "hdr_upload_image")
@@ -324,7 +324,7 @@ def draw_panel_scene_upload(self, context):
 
 def draw_assetbar_show_hide(layout, props):
     s = bpy.context.scene
-    ui_props = s.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
 
     if ui_props.assetbar_on:
         icon = 'HIDE_OFF'
@@ -771,7 +771,7 @@ class VIEW3D_PT_blenderkit_advanced_model_search(Panel):
     @classmethod
     def poll(cls, context):
         s = context.scene
-        ui_props = s.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
         return ui_props.down_up == 'SEARCH' and ui_props.asset_type == 'MODEL'
 
     def draw(self, context):
@@ -840,7 +840,7 @@ class VIEW3D_PT_blenderkit_advanced_material_search(Panel):
     @classmethod
     def poll(cls, context):
         s = context.scene
-        ui_props = s.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
         return ui_props.down_up == 'SEARCH' and ui_props.asset_type == 'MATERIAL'
 
     def draw(self, context):
@@ -884,7 +884,7 @@ class VIEW3D_PT_blenderkit_advanced_HDR_search(Panel):
     @classmethod
     def poll(cls, context):
         s = context.scene
-        ui_props = s.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
         return ui_props.down_up == 'SEARCH' and ui_props.asset_type == 'HDR'
 
     def draw(self, context):
@@ -909,7 +909,7 @@ class VIEW3D_PT_blenderkit_categories(Panel):
     @classmethod
     def poll(cls, context):
         s = context.scene
-        ui_props = s.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
         mode = True
         if ui_props.asset_type == 'BRUSH' and not (context.sculpt_object or context.image_paint_object):
             mode = False
@@ -941,7 +941,7 @@ class VIEW3D_PT_blenderkit_import_settings(Panel):
     @classmethod
     def poll(cls, context):
         s = context.scene
-        ui_props = s.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
         return ui_props.down_up == 'SEARCH' and ui_props.asset_type in ['MATERIAL', 'MODEL', 'SCENE', 'HDR']
 
     def draw(self, context):
@@ -949,7 +949,7 @@ class VIEW3D_PT_blenderkit_import_settings(Panel):
 
         s = context.scene
         wm = bpy.context.window_manager
-        ui_props = s.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
 
         if ui_props.asset_type == 'MODEL':
             # noinspection PyCallByClass
@@ -997,7 +997,7 @@ class VIEW3D_PT_blenderkit_unified(Panel):
 
     def draw(self, context):
         s = context.scene
-        ui_props = s.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
         user_preferences = bpy.context.preferences.addons['blenderkit'].preferences
         wm = bpy.context.window_manager
         layout = self.layout
@@ -1175,7 +1175,7 @@ class BlenderKitWelcomeOperator(bpy.types.Operator):
             # show n-key sidebar (spaces[index] has to be found for view3d too:
             # bpy.context.window_manager.windows[0].screen.areas[5].spaces[0].show_region_ui = False
             print('running search no')
-            ui_props = bpy.context.scene.blenderkitUI
+            ui_props = bpy.context.window_manager.blenderkitUI
             # random_searches = [
             #     ('MATERIAL', 'ice'),
             #     ('MODEL', 'car'),
@@ -1218,7 +1218,7 @@ class BlenderKitWelcomeOperator(bpy.types.Operator):
 
 
 def draw_asset_context_menu(layout, context, asset_data, from_panel=False):
-    ui_props = context.scene.blenderkitUI
+    ui_props = context.window_manager.blenderkitUI
 
     author_id = str(asset_data['author'].get('id'))
     wm = bpy.context.window_manager
@@ -1380,7 +1380,7 @@ def draw_asset_context_menu(layout, context, asset_data, from_panel=False):
 
 # def draw_asset_resolution_replace(self, context, resolution):
 #     layout = self.layout
-#     ui_props = bpy.context.scene.blenderkitUI
+#     ui_props = bpy.context.window_manager.blenderkitUI
 #
 #     op = layout.operator('scene.blenderkit_download', text=resolution)
 #     if ui_props.active_index == -3:
@@ -1408,7 +1408,7 @@ def draw_asset_context_menu(layout, context, asset_data, from_panel=False):
 #     bl_idname = "OBJECT_MT_blenderkit_resolution_menu"
 #
 #     def draw(self, context):
-#         ui_props = context.scene.blenderkitUI
+#         ui_props = context.window_manager.blenderkitUI
 #
 #         # sr = bpy.context.window_manager['search results']
 #
@@ -1424,7 +1424,7 @@ class OBJECT_MT_blenderkit_asset_menu(bpy.types.Menu):
     bl_idname = "OBJECT_MT_blenderkit_asset_menu"
 
     def draw(self, context):
-        ui_props = context.scene.blenderkitUI
+        ui_props = context.window_manager.blenderkitUI
 
         sr = bpy.context.window_manager['search results']
         asset_data = sr[ui_props.active_index]
@@ -1872,7 +1872,7 @@ class AssetPopupCard(bpy.types.Operator, ratings_utils.RatingsProperties):
         row.alert = False
 
         row.scale_y = 3
-        ui_props = bpy.context.scene.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
         row.prop(ui_props, 'drag_init_button', icon='MOUSE_LMB_DRAG', text='Click / Drag from here', emboss=True)
 
     def draw_menu_desc_author(self, context, layout, width=330):
@@ -2004,7 +2004,7 @@ class AssetPopupCard(bpy.types.Operator, ratings_utils.RatingsProperties):
 
     def execute(self, context):
         wm = context.window_manager
-        ui_props = context.scene.blenderkitUI
+        ui_props = context.window_manager.blenderkitUI
         ui_props.draw_tooltip = False
         sr = bpy.context.window_manager['search results']
         asset_data = sr[ui_props.active_index]
@@ -2204,7 +2204,7 @@ class LoginPopupDialog(bpy.types.Operator):
 
 def draw_panel_categories(self, context):
     s = context.scene
-    ui_props = s.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     user_preferences = bpy.context.preferences.addons['blenderkit'].preferences
     layout = self.layout
     # row = layout.row()
@@ -2301,7 +2301,7 @@ def header_search_draw(self, context):
         layout = self.layout
         s = bpy.context.scene
         wm = bpy.context.window_manager
-        ui_props = s.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
         if ui_props.asset_type == 'MODEL':
             props = wm.blenderkit_models
         if ui_props.asset_type == 'MATERIAL':
diff --git a/blenderkit/upload.py b/blenderkit/upload.py
index c724dde5..65a70780 100644
--- a/blenderkit/upload.py
+++ b/blenderkit/upload.py
@@ -435,7 +435,7 @@ def get_upload_data(caller=None, context=None, asset_type=None):
         }
 
     elif asset_type == 'HDR':
-        ui_props = bpy.context.scene.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
 
         # imagename = ui_props.hdr_upload_image
         image = ui_props.hdr_upload_image  # bpy.data.images.get(imagename)
@@ -546,7 +546,7 @@ def patch_individual_metadata(asset_id, metadata_dict, api_key):
 #
 #     def draw(self, context):
 #         layout = self.layout
-#         ui_props = context.scene.blenderkitUI
+#         ui_props = context.window_manager.blenderkitUI
 #
 #         # sr = bpy.context.window_manager['search results']
 #         sr = bpy.context.window_manager['search results']
@@ -667,7 +667,7 @@ class FastMetadata(bpy.types.Operator):
     @classmethod
     def poll(cls, context):
         scene = bpy.context.scene
-        ui_props = scene.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
         return True
 
     def draw(self, context):
@@ -693,7 +693,7 @@ class FastMetadata(bpy.types.Operator):
 
     def execute(self, context):
         user_preferences = bpy.context.preferences.addons['blenderkit'].preferences
-        props = bpy.context.scene.blenderkitUI
+        props = bpy.context.window_manager.blenderkitUI
         if self.subcategory1 != 'NONE':
             category = self.subcategory1
         elif self.subcategory != 'NONE':
@@ -722,7 +722,7 @@ class FastMetadata(bpy.types.Operator):
 
     def invoke(self, context, event):
         scene = bpy.context.scene
-        ui_props = scene.blenderkitUI
+        ui_props = bpy.context.window_manager.blenderkitUI
         if ui_props.active_index > -1:
             sr = bpy.context.window_manager['search results']
             asset_data = dict(sr[ui_props.active_index])
@@ -791,7 +791,7 @@ def get_upload_location(props):
 
     '''
     scene = bpy.context.scene
-    ui_props = scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     if ui_props.asset_type == 'MODEL':
         if bpy.context.view_layer.objects.active is not None:
             ob = utils.get_active_model()
diff --git a/blenderkit/utils.py b/blenderkit/utils.py
index 42e3d331..c11dc255 100644
--- a/blenderkit/utils.py
+++ b/blenderkit/utils.py
@@ -87,7 +87,7 @@ def get_active_model():
 
 def get_active_HDR():
     scene = bpy.context.scene
-    ui_props = scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     image = ui_props.hdr_upload_image
     return image
 
@@ -179,7 +179,7 @@ def get_search_props():
     wm = bpy.context.window_manager
     if scene is None:
         return;
-    uiprops = scene.blenderkitUI
+    uiprops = bpy.context.window_manager.blenderkitUI
     props = None
     if uiprops.asset_type == 'MODEL':
         if not hasattr(wm, 'blenderkit_models'):
@@ -234,7 +234,7 @@ def get_active_asset_by_type(asset_type='model'):
 
 def get_active_asset():
     scene = bpy.context.scene
-    ui_props = scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     if ui_props.asset_type == 'MODEL':
         if bpy.context.view_layer.objects.active is not None:
             ob = get_active_model()
@@ -257,7 +257,7 @@ def get_active_asset():
 
 def get_upload_props():
     scene = bpy.context.scene
-    ui_props = scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     if ui_props.asset_type == 'MODEL':
         if bpy.context.view_layer.objects.active is not None:
             ob = get_active_model()
@@ -346,7 +346,7 @@ def save_prefs(self, context):
 
 def uploadable_asset_poll():
     '''returns true if active asset type can be uploaded'''
-    ui_props = bpy.context.scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
     if ui_props.asset_type == 'MODEL':
         return bpy.context.view_layer.objects.active is not None
     if ui_props.asset_type == 'MATERIAL':
@@ -719,7 +719,7 @@ def name_update(props):
     and only displayName gets written to server.
     '''
     scene = bpy.context.scene
-    ui_props = scene.blenderkitUI
+    ui_props = bpy.context.window_manager.blenderkitUI
 
     # props = get_upload_props()
     if props.name_old != props.name: