Merge remote-tracking branch 'b/main'

scripts/presets/keyconfig/keymap_data/blender_default.py

@@ -5820,7 +5820,7 @@ def km_edit_curves(params):
 
 
 # Point cloud edit mode.
-def km_edit_point_cloud(params):
+def km_edit_pointcloud(params):
     items = []
     keymap = (
         "Point Cloud",
@@ -5832,11 +5832,11 @@ def km_edit_point_cloud(params):
         # Transform Actions.
         *_template_items_transform_actions(params, use_bend=True, use_mirror=True),
 
-        ("point_cloud.duplicate_move", {"type": 'D', "value": 'PRESS', "shift": True}, None),
-        *_template_items_select_actions(params, "point_cloud.select_all"),
-        ("point_cloud.delete", {"type": 'X', "value": 'PRESS'}, None),
-        ("point_cloud.delete", {"type": 'DEL', "value": 'PRESS'}, None),
-        ("point_cloud.separate", {"type": 'P', "value": 'PRESS'}, None),
+        ("pointcloud.duplicate_move", {"type": 'D', "value": 'PRESS', "shift": True}, None),
+        *_template_items_select_actions(params, "pointcloud.select_all"),
+        ("pointcloud.delete", {"type": 'X', "value": 'PRESS'}, None),
+        ("pointcloud.delete", {"type": 'DEL', "value": 'PRESS'}, None),
+        ("pointcloud.separate", {"type": 'P', "value": 'PRESS'}, None),
         ("transform.transform", {"type": 'S', "value": 'PRESS', "alt": True},
          {"properties": [("mode", 'CURVE_SHRINKFATTEN')]}),
     ])
@@ -8400,7 +8400,7 @@ def generate_keymaps(params=None):
         km_edit_font(params),
         km_edit_curve_legacy(params),
         km_edit_curves(params),
-        km_edit_point_cloud(params),
+        km_edit_pointcloud(params),
 
         # Modal maps.
         km_eyedropper_modal_map(params),

scripts/presets/keyconfig/keymap_data/industry_compatible_data.py

@@ -3418,7 +3418,7 @@ def km_sculpt_curves(params):
 
 
 # Point cloud edit mode.
-def km_point_cloud(params):
+def km_pointcloud(params):
     items = []
     keymap = (
         "Point Cloud",
@@ -3428,14 +3428,14 @@ def km_point_cloud(params):
 
     items.extend([
         # Selection Operators
-        ("point_cloud.select_all", {"type": 'A', "value": 'PRESS',
+        ("pointcloud.select_all", {"type": 'A', "value": 'PRESS',
          "ctrl": True}, {"properties": [("action", 'SELECT')]}),
-        ("point_cloud.select_all", {"type": 'A', "value": 'PRESS', "shift": True,
+        ("pointcloud.select_all", {"type": 'A', "value": 'PRESS', "shift": True,
          "ctrl": True}, {"properties": [("action", 'DESELECT')]}),
-        ("point_cloud.select_all", {"type": 'I', "value": 'PRESS',
+        ("pointcloud.select_all", {"type": 'I', "value": 'PRESS',
          "ctrl": True}, {"properties": [("action", 'INVERT')]}),
         # Delete
-        ("point_cloud.delete", {"type": 'DEL', "value": 'PRESS'}, None),
+        ("pointcloud.delete", {"type": 'DEL', "value": 'PRESS'}, None),
     ])
 
     return keymap
@@ -3794,7 +3794,7 @@ def generate_keymaps_impl(params=None):
         km_font(params),
         km_curves(params),
         km_sculpt_curves(params),
-        km_point_cloud(params),
+        km_pointcloud(params),
         km_object_non_modal(params),
 
         # Modal maps.

scripts/startup/bl_ui/properties_paint_common.py

@@ -1171,7 +1171,7 @@ def brush_shared_settings(layout, context, brush, popover=False):
         layout.row().prop(brush, "direction", expand=True)
 
 
-def brush_settings_advanced(layout, context, brush, popover=False):
+def brush_settings_advanced(layout, context, settings, brush, popover=False):
     """Draw advanced brush settings for Sculpt, Texture/Vertex/Weight Paint modes."""
 
     mode = UnifiedPaintPanel.get_brush_mode(context)
@@ -1317,8 +1317,8 @@ def brush_settings_advanced(layout, context, brush, popover=False):
 
         elif brush.image_tool == 'CLONE':
             if mode == 'PAINT_2D':
-                layout.prop(brush, "clone_image", text="Image")
-                layout.prop(brush, "clone_alpha", text="Alpha")
+                layout.prop(settings, "clone_image", text="Image")
+                layout.prop(settings, "clone_alpha", text="Alpha")
 
     # Vertex Paint #
     elif mode == 'PAINT_VERTEX':

scripts/startup/bl_ui/space_filebrowser.py

@@ -529,7 +529,7 @@ def draw(self, _context):
 
         layout.operator("file.select_all", text="All").action = 'SELECT'
         layout.operator("file.select_all", text="None").action = 'DESELECT'
-        layout.operator("file.select_all", text="Inverse").action = 'INVERT'
+        layout.operator("file.select_all", text="Invert").action = 'INVERT'
 
         layout.separator()
 

scripts/startup/bl_ui/space_image.py

@@ -1255,7 +1255,7 @@ def draw(self, context):
         settings = context.tool_settings.image_paint
         brush = settings.brush
         if brush:
-            brush_settings_advanced(layout.column(), context, brush, self.is_popover)
+            brush_settings_advanced(layout.column(), context, settings, brush, self.is_popover)
 
 
 class IMAGE_PT_paint_color(Panel, ImagePaintPanel):

scripts/startup/bl_ui/space_toolsystem_toolbar.py

@@ -3478,7 +3478,7 @@ def tools_all(cls):
             None,
             *_tools_annotate,
         ],
-        'EDIT_POINT_CLOUD': [
+        'EDIT_POINTCLOUD': [
             *_tools_select,
             _defs_view3d_generic.cursor,
             None,

scripts/startup/bl_ui/space_view3d.py

@@ -1202,7 +1202,7 @@ def draw(self, context):
             elif mode_string in {'EDIT_CURVE', 'EDIT_SURFACE'}:
                 layout.menu("VIEW3D_MT_edit_curve_ctrlpoints")
                 layout.menu("VIEW3D_MT_edit_curve_segments")
-            elif mode_string == 'EDIT_POINT_CLOUD':
+            elif mode_string == 'EDIT_POINTCLOUD':
                 layout.template_node_operator_asset_root_items()
             elif mode_string == 'EDIT_CURVES':
                 layout.menu("VIEW3D_MT_edit_curves_control_points")
@@ -1285,6 +1285,7 @@ def draw(self, context):
             'EDIT_CURVES',
             'EDIT_LATTICE',
             'EDIT_METABALL',
+            'EDIT_POINTCLOUD',
         }:
             layout.operator("transform.vertex_warp", text="Warp")
             layout.operator_context = 'EXEC_REGION_WIN'
@@ -1303,7 +1304,7 @@ def draw(self, context):
         if context.mode == 'EDIT_MESH':
             layout.operator("transform.shrink_fatten", text="Shrink/Fatten")
             layout.operator("transform.skin_resize")
-        elif context.mode in {'EDIT_CURVE', 'EDIT_GREASE_PENCIL', 'EDIT_CURVES', 'EDIT_POINT_CLOUD'}:
+        elif context.mode in {'EDIT_CURVE', 'EDIT_GREASE_PENCIL', 'EDIT_CURVES', 'EDIT_POINTCLOUD'}:
             layout.operator("transform.transform", text="Radius").mode = 'CURVE_SHRINKFATTEN'
 
         if context.mode != 'EDIT_CURVES' and context.mode != 'EDIT_GREASE_PENCIL':
@@ -2314,15 +2315,19 @@ def draw(self, _context):
         layout.operator("paint.vert_select_ungrouped", text="Ungrouped Vertices")
 
 
-class VIEW3D_MT_select_edit_point_cloud(Menu):
+class VIEW3D_MT_select_edit_pointcloud(Menu):
     bl_label = "Select"
 
     def draw(self, _context):
         layout = self.layout
 
-        layout.operator("point_cloud.select_all", text="All").action = 'SELECT'
-        layout.operator("point_cloud.select_all", text="None").action = 'DESELECT'
-        layout.operator("point_cloud.select_all", text="Invert").action = 'INVERT'
+        layout.operator("pointcloud.select_all", text="All").action = 'SELECT'
+        layout.operator("pointcloud.select_all", text="None").action = 'DESELECT'
+        layout.operator("pointcloud.select_all", text="Invert").action = 'INVERT'
+
+        layout.separator()
+
+        layout.operator("pointcloud.select_random")
 
         layout.template_node_operator_asset_menu_items(catalog_path=self.bl_label)
 
@@ -3393,16 +3398,19 @@ def draw(self, context):
         layout = self.layout
         ob = context.active_object
 
-        if ob and ob.type != 'EMPTY':
-            layout.operator_enum("object.convert", "target")
+        layout.operator_enum("object.convert", "target")
 
-        else:
+        if ob and ob.type == 'EMPTY':
             # Potrace lib dependency.
             if bpy.app.build_options.potrace:
+                layout.separator()
+
                 layout.operator("image.convert_to_mesh_plane", text="Convert to Mesh Plane", icon='MESH_PLANE')
                 layout.operator("grease_pencil.trace_image", icon='OUTLINER_OB_GREASEPENCIL')
 
         if ob and ob.type == 'CURVES':
+            layout.separator()
+
             layout.operator("curves.convert_to_particle_system", text="Particle System")
 
         layout.template_node_operator_asset_menu_items(catalog_path="Object/Convert")
@@ -5926,11 +5934,11 @@ def draw(self, context):
         layout = self.layout
         layout.menu("VIEW3D_MT_transform")
         layout.separator()
-        layout.operator("point_cloud.duplicate_move")
+        layout.operator("pointcloud.duplicate_move")
         layout.separator()
-        layout.operator("point_cloud.attribute_set")
-        layout.operator("point_cloud.delete")
-        layout.operator("point_cloud.separate")
+        layout.operator("pointcloud.attribute_set")
+        layout.operator("pointcloud.delete")
+        layout.operator("pointcloud.separate")
         layout.template_node_operator_asset_menu_items(catalog_path=self.bl_label)
 
 
@@ -8977,7 +8985,7 @@ class VIEW3D_AST_brush_gpencil_weight(AssetShelfHiddenByDefault, View3DAssetShel
     VIEW3D_MT_select_edit_grease_pencil,
     VIEW3D_MT_select_paint_mask,
     VIEW3D_MT_select_paint_mask_vertex,
-    VIEW3D_MT_select_edit_point_cloud,
+    VIEW3D_MT_select_edit_pointcloud,
     VIEW3D_MT_edit_curves_select_more_less,
     VIEW3D_MT_select_edit_curves,
     VIEW3D_MT_select_sculpt_curves,

scripts/startup/bl_ui/space_view3d_toolbar.py

@@ -408,7 +408,7 @@ def draw(self, context):
         settings = UnifiedPaintPanel.paint_settings(context)
         brush = settings.brush
 
-        brush_settings_advanced(layout.column(), context, brush, self.is_popover)
+        brush_settings_advanced(layout.column(), context, settings, brush, self.is_popover)
 
 
 class VIEW3D_PT_tools_brush_color(Panel, View3DPaintPanel):

source/blender/blenkernel/BKE_context.hh

@@ -126,7 +126,7 @@ enum eContextObjectMode {
   CTX_MODE_EDIT_LATTICE,
   CTX_MODE_EDIT_CURVES,
   CTX_MODE_EDIT_GREASE_PENCIL,
-  CTX_MODE_EDIT_POINT_CLOUD,
+  CTX_MODE_EDIT_POINTCLOUD,
   CTX_MODE_POSE,
   CTX_MODE_SCULPT,
   CTX_MODE_PAINT_WEIGHT,

source/blender/blenkernel/BKE_lib_id.hh

@@ -59,7 +59,7 @@ size_t BKE_libblock_get_alloc_info(short type, const char **r_name);
  * Allocates and returns memory of the right size for the specified block type,
  * initialized to zero.
  */
-void *BKE_libblock_alloc_notest(short type) ATTR_WARN_UNUSED_RESULT;
+ID *BKE_libblock_alloc_notest(short type) ATTR_WARN_UNUSED_RESULT;
 /**
  * Allocates and returns an ID block of the specified type, with the specified name
  * (adjusted as necessary to ensure uniqueness), and appended to the specified list.