diff options
Diffstat (limited to 'release')
7 files changed, 48 insertions, 20 deletions
diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index 5132b358f5e..cedbe542287 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -384,7 +384,7 @@ class AddPresetFluid(AddPresetBase, Operator): """Add or remove a Fluid Preset""" bl_idname = "fluid.preset_add" bl_label = "Add Fluid Preset" - preset_menu = "FLUID_MT_presets" + preset_menu = "FLUID_PT_presets" preset_defines = [ "fluid = bpy.context.fluid" diff --git a/release/scripts/startup/bl_operators/spreadsheet.py b/release/scripts/startup/bl_operators/spreadsheet.py index a2f9b2ad412..fa6568f6f11 100644 --- a/release/scripts/startup/bl_operators/spreadsheet.py +++ b/release/scripts/startup/bl_operators/spreadsheet.py @@ -24,7 +24,7 @@ class SPREADSHEET_OT_toggle_pin(bpy.types.Operator): '''Turn on or off pinning''' bl_idname = "spreadsheet.toggle_pin" bl_label = "Toggle Pin" - bl_options = {'REGISTER', 'UNDO'} + bl_options = {'REGISTER'} @classmethod def poll(cls, context): diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 60caa39b723..a9f040db9b5 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -1263,6 +1263,8 @@ class PARTICLE_PT_render(ParticleButtonsPanel, Panel): if ( part.type == 'EMITTER' or + part.type in {'FLIP', 'SPRAY', 'BUBBLE', 'FOAM', 'TRACER', + 'SPRAYFOAM', 'SPRAYBUBBLE', 'FOAMBUBBLE', 'SPRAYFOAMBUBBLE'} or (part.render_type in {'OBJECT', 'COLLECTION'} and part.type == 'HAIR') ): if part.render_type != 'NONE': diff --git a/release/scripts/startup/bl_ui/space_spreadsheet.py b/release/scripts/startup/bl_ui/space_spreadsheet.py index 1d124019ce8..1ba650fa096 100644 --- a/release/scripts/startup/bl_ui/space_spreadsheet.py +++ b/release/scripts/startup/bl_ui/space_spreadsheet.py @@ -31,6 +31,9 @@ class SPREADSHEET_HT_header(bpy.types.Header): pinned_id = space.pinned_id used_id = pinned_id if pinned_id else context.active_object + layout.prop(space, "geometry_component_type", text="") + layout.prop(space, "attribute_domain", text="") + if used_id: layout.label(text=used_id.name, icon="OBJECT_DATA") diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index b214dc0c245..5fcd84d119f 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -2269,6 +2269,7 @@ class USERPREF_PT_experimental_debugging(ExperimentalPanel, Panel): self._draw_items( context, ( ({"property": "use_undo_legacy"}, "T60695"), + ({"property": "override_auto_resync"}, "T83811"), ({"property": "use_cycles_debug"}, None), ), ) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 4b687945974..e393ddf16d6 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3121,6 +3121,11 @@ class VIEW3D_MT_mask(Menu): props = layout.operator("sculpt.dirty_mask", text='Dirty Mask') + layout.separator() + + layout.menu("VIEW3D_MT_random_mask", text="Random Mask") + + class VIEW3D_MT_face_sets(Menu): bl_label = "Face Sets" @@ -3222,6 +3227,21 @@ class VIEW3D_MT_face_sets_init(Menu): op.mode = 'FACE_MAPS' +class VIEW3D_MT_random_mask(Menu): + bl_label = "Random Mask" + + def draw(self, _context): + layout = self.layout + + op = layout.operator("sculpt.mask_init", text='Per Vertex') + op.mode = 'RANDOM_PER_VERTEX' + + op = layout.operator("sculpt.mask_init", text='Per Face Set') + op.mode = 'RANDOM_PER_FACE_SET' + + op = layout.operator("sculpt.mask_init", text='Per Loose Part') + op.mode = 'RANDOM_PER_LOOSE_PART' + class VIEW3D_MT_particle(Menu): bl_label = "Particle" @@ -5013,7 +5033,7 @@ class VIEW3D_MT_edit_gpencil_stroke(Menu): layout.menu("GPENCIL_MT_move_to_layer") layout.menu("VIEW3D_MT_assign_material") layout.operator("gpencil.set_active_material", text="Set as Active Material") - layout.operator_menu_enum("gpencil.stroke_arrange", "direction", text="Arrange Strokes") + layout.operator_menu_enum("gpencil.stroke_arrange", "direction", text="Arrange") layout.separator() @@ -5024,7 +5044,7 @@ class VIEW3D_MT_edit_gpencil_stroke(Menu): layout.operator("gpencil.stroke_cyclical_set", text="Toggle Cyclic").type = 'TOGGLE' layout.operator_menu_enum("gpencil.stroke_caps_set", text="Toggle Caps", property="type") layout.operator("gpencil.stroke_flip", text="Switch Direction") - layout.prop(settings, "use_scale_thickness") + layout.prop(settings, "use_scale_thickness", text="Scale Thickness") layout.separator() layout.operator("gpencil.reset_transform_fill", text="Reset Fill Transform") @@ -5036,15 +5056,15 @@ class VIEW3D_MT_edit_gpencil_point(Menu): def draw(self, _context): layout = self.layout - layout.operator("gpencil.extrude_move", text="Extrude Points") + layout.operator("gpencil.extrude_move", text="Extrude") layout.separator() - layout.operator("gpencil.stroke_smooth", text="Smooth Points").only_selected = True + layout.operator("gpencil.stroke_smooth", text="Smooth").only_selected = True layout.separator() - layout.operator("gpencil.stroke_merge", text="Merge Points") + layout.operator("gpencil.stroke_merge", text="Merge") # TODO: add new RIP operator @@ -7048,12 +7068,12 @@ class VIEW3D_MT_gpencil_edit_context_menu(Menu): col.separator() - col.operator("gpencil.extrude_move", text="Extrude Points") + col.operator("gpencil.extrude_move", text="Extrude") col.separator() # Deform Operators - col.operator("gpencil.stroke_smooth", text="Smooth Points").only_selected = True + col.operator("gpencil.stroke_smooth", text="Smooth").only_selected = True col.operator("transform.bend", text="Bend") col.operator("transform.shear", text="Shear") col.operator("transform.tosphere", text="To Sphere") @@ -7061,8 +7081,8 @@ class VIEW3D_MT_gpencil_edit_context_menu(Menu): col.separator() - col.menu("VIEW3D_MT_mirror", text="Mirror Points") - col.menu("GPENCIL_MT_snap", text="Snap Points") + col.menu("VIEW3D_MT_mirror", text="Mirror") + col.menu("GPENCIL_MT_snap", text="Snap") col.separator() @@ -7075,15 +7095,15 @@ class VIEW3D_MT_gpencil_edit_context_menu(Menu): col.separator() # Removal Operators - col.operator("gpencil.stroke_merge", text="Merge Points") + col.operator("gpencil.stroke_merge", text="Merge") col.operator("gpencil.stroke_merge_by_distance").use_unselected = False col.operator("gpencil.stroke_split", text="Split") col.operator("gpencil.stroke_separate", text="Separate").mode = 'POINT' col.separator() - col.operator("gpencil.delete", text="Delete Points").type = 'POINTS' - col.operator("gpencil.dissolve", text="Dissolve Points").type = 'POINTS' + col.operator("gpencil.delete", text="Delete").type = 'POINTS' + col.operator("gpencil.dissolve", text="Dissolve").type = 'POINTS' col.operator("gpencil.dissolve", text="Dissolve Between").type = 'BETWEEN' col.operator("gpencil.dissolve", text="Dissolve Unselected").type = 'UNSELECT' @@ -7100,7 +7120,7 @@ class VIEW3D_MT_gpencil_edit_context_menu(Menu): col.separator() - col.operator("gpencil.stroke_smooth", text="Smooth Stroke").only_selected = False + col.operator("gpencil.stroke_smooth", text="Smooth").only_selected = False col.operator("transform.transform", text="Shrink/Fatten").mode = 'GPENCIL_SHRINKFATTEN' col.separator() @@ -7109,12 +7129,12 @@ class VIEW3D_MT_gpencil_edit_context_menu(Menu): col.menu("GPENCIL_MT_move_to_layer") col.menu("VIEW3D_MT_assign_material") col.operator("gpencil.set_active_material", text="Set as Active Material") - col.operator_menu_enum("gpencil.stroke_arrange", "direction", text="Arrange Strokes") + col.operator_menu_enum("gpencil.stroke_arrange", "direction", text="Arrange") col.separator() - col.menu("VIEW3D_MT_mirror", text="Mirror Stroke") - col.menu("VIEW3D_MT_snap", text="Snap Stroke") + col.menu("VIEW3D_MT_mirror", text="Mirror") + col.menu("VIEW3D_MT_snap", text="Snap") col.separator() @@ -7134,11 +7154,11 @@ class VIEW3D_MT_gpencil_edit_context_menu(Menu): col.separator() - col.operator("gpencil.delete", text="Delete Strokes").type = 'STROKES' + col.operator("gpencil.delete", text="Delete").type = 'STROKES' col.separator() - col.operator("gpencil.reproject", text="Reproject Strokes") + col.operator("gpencil.reproject", text="Reproject") def draw_gpencil_layer_active(context, layout): @@ -7563,6 +7583,7 @@ classes = ( VIEW3D_MT_mask, VIEW3D_MT_face_sets, VIEW3D_MT_face_sets_init, + VIEW3D_MT_random_mask, VIEW3D_MT_particle, VIEW3D_MT_particle_context_menu, VIEW3D_MT_particle_showhide, diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index a2122fb01b7..cac5a8f835c 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -493,6 +493,7 @@ geometry_node_categories = [ NodeItem("GeometryNodeAttributeSampleTexture"), NodeItem("GeometryNodeAttributeCombineXYZ"), NodeItem("GeometryNodeAttributeSeparateXYZ"), + NodeItem("GeometryNodeAttributeRemove"), ]), GeometryNodeCategory("GEO_COLOR", "Color", items=[ NodeItem("ShaderNodeValToRGB"), |