Merge branch 'blender-v3.0-release'

blenderkit/asset_bar_op.py

@@ -108,6 +108,15 @@ def modal_inside(self, context, event):
         self.update_ui_size(context)
         self.update_layout(context, event)
 
+    # this was here to check if sculpt stroke is running, but obviously that didn't help,
+    #  since the RELEASE event is cought by operator and thus there is no way to detect a stroke has ended...
+    if bpy.context.mode in ('SCULPT', 'PAINT_TEXTURE'):
+        if event.type == 'MOUSEMOVE':  # ASSUME THAT SCULPT OPERATOR ACTUALLY STEALS THESE EVENTS,
+            # SO WHEN THERE ARE SOME WE CAN APPEND BRUSH...
+            bpy.context.window_manager['appendable'] = True
+        if event.type == 'LEFTMOUSE':
+            if event.value == 'PRESS':
+                bpy.context.window_manager['appendable'] = False
     return {"PASS_THROUGH"}
 
 

blenderkit/download.py

@@ -302,7 +302,6 @@ def append_asset(asset_data, **kwargs):  # downloaders=[], location=None,
 
 
     '''
-
     file_names = paths.get_download_filepaths(asset_data, kwargs['resolution'])
     props = None
     #####
@@ -439,7 +438,6 @@ def append_asset(asset_data, **kwargs):  # downloaders=[], location=None,
             lib['asset_data'] = asset_data
 
     elif asset_data['assetType'] == 'brush':
-
         # TODO if already in scene, should avoid reappending.
         inscene = False
         for b in bpy.data.brushes:

blenderkit/search.py

@@ -431,7 +431,7 @@ def search_timer():
             if first_search_parsing:
                 first_search_parsing = False
                 all_notifications_count = comments_utils.count_all_notifications()
-                comments_utils.get_notifications_thread(api_key, all_count=all_notifications_count)
+                comments_utils.get_notifications_thread(preferences.api_key, all_count=all_notifications_count)
                 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)

mesh_snap_utilities_line/__init__.py

@@ -21,11 +21,11 @@
 bl_info = {
     "name": "Snap_Utilities_Line",
     "author": "Germano Cavalcante",
-    "version": (6, 9, 4),
+    "version": (6, 9, 5),
     "blender": (3, 0, 0),
     "location": "View3D > TOOLS > Line Tool",
     "description": "Extends Blender Snap controls",
-    "doc_url" : "https://blenderartists.org/t/cad-snap-utilities",
+    "doc_url" : "https://docs.blender.org/manual/en/latest/addons/mesh/snap_utilities_line.html",
     "category": "Mesh",
 }