[Bf-extensions-cvs] [fccc9b04] master: Merge branch 'blender-v3.0-release'

[Julien Duroure]

Commit: fccc9b04f23ccf445b009e5e61a0e86f7410cb44
Author: Julien Duroure
Date:   Fri Nov 12 09:36:38 2021 +0100
Branches: master
https://developer.blender.org/rBAfccc9b04f23ccf445b009e5e61a0e86f7410cb44

Merge branch 'blender-v3.0-release'

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



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

diff --cc blenderkit/asset_bar_op.py
index 98b89f14,710d7151..3afb37e9
--- a/blenderkit/asset_bar_op.py
+++ b/blenderkit/asset_bar_op.py
@@@ -920,10 -927,11 +927,18 @@@ class BlenderKitAssetBarOperator(BL_UI_
                              asset_button.red_alert.visible = False
                      elif utils.profile_is_validator():
                          asset_button.red_alert.visible = False
++<<<<<<< HEAD
 +                else:
 +                    asset_button.validation_icon.visible = False
 +                    if utils.profile_is_validator():
 +                        asset_button.red_alert.visible = False
++=======
+             else:
+                 asset_button.visible = False
+                 asset_button.validation_icon.visible = False
+                 if utils.profile_is_validator():
+                     asset_button.red_alert.visible = False
++>>>>>>> blender-v3.0-release
  
      def scroll_update(self):
          sr = bpy.context.window_manager.get('search results')
@@@ -937,6 -945,7 +952,10 @@@
          self.scroll_offset = min(self.scroll_offset, len(sr) - (self.wcount * self.hcount))
          self.scroll_offset = max(self.scroll_offset, 0)
          self.update_images()
++<<<<<<< HEAD
++=======
+ 
++>>>>>>> blender-v3.0-release
          # print(sro)
          if sro['count'] > len(sr) and len(sr) - self.scroll_offset < (self.wcount * self.hcount) + 15:
              self.search_more()
diff --cc blenderkit/ratings_utils.py
index d813f444,798d5c7e..46dc031b
--- a/blenderkit/ratings_utils.py
+++ b/blenderkit/ratings_utils.py
@@@ -101,7 -101,7 +101,11 @@@ def get_rating(asset_id, headers)
      if r.status_code == 200:
          rj = r.json()
          ratings = {}
++<<<<<<< HEAD
 +        print(rj)
++=======
+         # print(rj)
++>>>>>>> blender-v3.0-release
          # store ratings - send them to task queue
          for r in rj['results']:
              ratings[r['ratingType']] = r['score']
diff --cc blenderkit/search.py
index f86a9a5e,36e4e172..24e46da7
--- a/blenderkit/search.py
+++ b/blenderkit/search.py
@@@ -197,9 -197,9 +197,15 @@@ def scene_load(context)
      categories.load_categories()
      if not bpy.app.timers.is_registered(refresh_token_timer) and not bpy.app.background:
          bpy.app.timers.register(refresh_token_timer, persistent=True, first_interval=36000)
++<<<<<<< HEAD
 +    if utils.experimental_enabled() and not bpy.app.timers.is_registered(
 +            refresh_notifications_timer) and not bpy.app.background:
 +        bpy.app.timers.register(refresh_notifications_timer, persistent=True, first_interval=5)
++=======
+     # if utils.experimental_enabled() and not bpy.app.timers.is_registered(
+     #         refresh_notifications_timer) and not bpy.app.background:
+     #     bpy.app.timers.register(refresh_notifications_timer, persistent=True, first_interval=5)
++>>>>>>> blender-v3.0-release
  
      update_assets_data()
  
@@@ -218,10 -218,11 +224,16 @@@ def fetch_server_data()
              get_profile()
          if bpy.context.window_manager.get('bkit_categories') is None:
              categories.fetch_categories_thread(api_key, force=False)
++<<<<<<< HEAD
 +        all_notifications_count = comments_utils.count_all_notifications()
 +        comments_utils.get_notifications_thread(api_key, all_count = all_notifications_count)
++=======
+         # all_notifications_count = comments_utils.count_all_notifications()
+         # comments_utils.get_notifications_thread(api_key, all_count = all_notifications_count)
++>>>>>>> blender-v3.0-release
  
  first_time = True
+ first_search_parsing = True
  last_clipboard = ''
  
  
@@@ -487,9 -497,11 +508,14 @@@ def search_timer()
                      # jump back
                      ui_props.scroll_offset = 0
                  props.search_error = False
-                 props.report = 'Found %i results. ' % (wm['search results orig']['count'])
+                 props.report = f"Found {wm['search results orig']['count']} results."
                  if len(wm['search results']) == 0:
                      tasks_queue.add_task((reports.add_report, ('No matching results found.',)))
++<<<<<<< HEAD
++=======
+                 else:
+                     tasks_queue.add_task((reports.add_report, (f"Found {wm['search results orig']['count']} results.",)))
++>>>>>>> blender-v3.0-release
                  # undo push
                  # bpy.ops.wm.undo_push_context(message='Get BlenderKit search')
                  # show asset bar automatically, but only on first page - others are loaded also when asset bar is hidden.
diff --cc blenderkit/ui_panels.py
index d20b1f6e,d976fbdd..c2d17a51
--- a/blenderkit/ui_panels.py
+++ b/blenderkit/ui_panels.py
@@@ -2250,8 -2250,6 +2250,11 @@@ class AssetPopupCard(bpy.types.Operator
      def prefill_ratings(self):
          # pre-fill ratings
          ratings = ratings_utils.get_rating_local(self.asset_id)
++<<<<<<< HEAD
 +        print('prefill ratings')
 +        print(ratings)
++=======
++>>>>>>> blender-v3.0-release
          if ratings and ratings.get('quality'):
              self.rating_quality = ratings['quality']
          if ratings and ratings.get('working_hours'):
diff --cc io_scene_gltf2/__init__.py
index 9fdc2ac3,babf37fb..069596fa
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@@ -15,7 -15,7 +15,7 @@@
  bl_info = {
      'name': 'glTF 2.0 format',
      'author': 'Julien Duroure, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
-     "version": (1, 8, 1),
 -    "version": (1, 7, 33),
++    "version": (1, 8, 2),
      'blender': (3, 0, 0),
      'location': 'File > Import-Export',
      'description': 'Import-Export as glTF 2.0',