diff options
Diffstat (limited to 'release/scripts/startup')
20 files changed, 115 insertions, 86 deletions
diff --git a/release/scripts/startup/bl_operators/gpencil_mesh_bake.py b/release/scripts/startup/bl_operators/gpencil_mesh_bake.py index ec7ff970537..d4b1b11ed69 100644 --- a/release/scripts/startup/bl_operators/gpencil_mesh_bake.py +++ b/release/scripts/startup/bl_operators/gpencil_mesh_bake.py @@ -103,7 +103,7 @@ class GPENCIL_OT_mesh_bake(Operator): name="Target Object", description="Grease Pencil Object", items=my_objlist_callback - ) + ) frame_target: IntProperty( name="Target Frame", description="Destination frame for the baked animation", diff --git a/release/scripts/startup/bl_operators/object_quick_effects.py b/release/scripts/startup/bl_operators/object_quick_effects.py index 5b9764eabfb..62d522fabd7 100644 --- a/release/scripts/startup/bl_operators/object_quick_effects.py +++ b/release/scripts/startup/bl_operators/object_quick_effects.py @@ -447,10 +447,10 @@ class QuickLiquid(Operator): bl_options = {'REGISTER', 'UNDO'} show_flows: BoolProperty( - name="Render Liquid Objects", - description="Keep the liquid objects visible during rendering", - default=False, - ) + name="Render Liquid Objects", + description="Keep the liquid objects visible during rendering", + default=False, + ) def execute(self, context): if not bpy.app.build_options.fluid: @@ -625,6 +625,7 @@ class QuickParticles(Operator): pointcloud_object.show_bounds = True return {'FINISHED'} + classes = ( QuickExplode, QuickFur, diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index 989cacd8765..ca8999e9588 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -388,12 +388,12 @@ class AddPresetFluid(AddPresetBase, Operator): preset_defines = [ "fluid = bpy.context.fluid" - ] + ] preset_values = [ "fluid.domain_settings.viscosity_base", "fluid.domain_settings.viscosity_exponent", - ] + ] preset_subdir = "fluid" diff --git a/release/scripts/startup/bl_operators/uvcalc_lightmap.py b/release/scripts/startup/bl_operators/uvcalc_lightmap.py index a4984359c90..e4edcbb62b3 100644 --- a/release/scripts/startup/bl_operators/uvcalc_lightmap.py +++ b/release/scripts/startup/bl_operators/uvcalc_lightmap.py @@ -559,7 +559,7 @@ def lightmap_uvpack( def unwrap(operator, context, **kwargs): - # switch to object mode + # switch to object mode is_editmode = context.object and context.object.mode == 'EDIT' if is_editmode: bpy.ops.object.mode_set(mode='OBJECT', toggle=False) diff --git a/release/scripts/startup/bl_operators/vertexpaint_dirt.py b/release/scripts/startup/bl_operators/vertexpaint_dirt.py index 62ef3cb34b5..3f43571fee5 100644 --- a/release/scripts/startup/bl_operators/vertexpaint_dirt.py +++ b/release/scripts/startup/bl_operators/vertexpaint_dirt.py @@ -74,7 +74,7 @@ def applyVertexDirt(me, blur_iterations, blur_strength, clamp_dirt, clamp_clean, tot_con = len(con[i]) if tot_con == 0: - ang = pi / 2.0 # assume 90°, i. e. flat + ang = pi / 2.0 # assume 90°, i. e. flat else: vec /= tot_con diff --git a/release/scripts/startup/bl_operators/view3d.py b/release/scripts/startup/bl_operators/view3d.py index 4a7a54bac28..968dc8e5dba 100644 --- a/release/scripts/startup/bl_operators/view3d.py +++ b/release/scripts/startup/bl_operators/view3d.py @@ -73,10 +73,10 @@ class VIEW3D_OT_edit_mesh_extrude_move(Operator): bl_idname = "view3d.edit_mesh_extrude_move_normal" dissolve_and_intersect: BoolProperty( - name="dissolve_and_intersect", - default=False, - description="Dissolves adjacent faces and intersects new geometry" - ) + name="dissolve_and_intersect", + default=False, + description="Dissolves adjacent faces and intersects new geometry" + ) @classmethod def poll(cls, context): diff --git a/release/scripts/startup/bl_ui/properties_data_hair.py b/release/scripts/startup/bl_ui/properties_data_hair.py index 58491f16c6e..2f52372eaed 100644 --- a/release/scripts/startup/bl_ui/properties_data_hair.py +++ b/release/scripts/startup/bl_ui/properties_data_hair.py @@ -56,7 +56,7 @@ class HAIR_MT_add_attribute(Menu): @staticmethod def add_standard_attribute(layout, hair, name, data_type, domain): - exists = hair.attributes.get(name) != None + exists = hair.attributes.get(name) is not None col = layout.column() col.enabled = not exists @@ -106,14 +106,21 @@ class DATA_PT_hair_attributes(DataButtonsPanel, Panel): row = layout.row() col = row.column() - col.template_list("HAIR_UL_attributes", "attributes", hair, "attributes", hair.attributes, "active_index", rows=3) + col.template_list( + "HAIR_UL_attributes", + "attributes", + hair, + "attributes", + hair.attributes, + "active_index", + rows=3, + ) col = row.column(align=True) col.menu("HAIR_MT_add_attribute", icon='ADD', text="") col.operator("geometry.attribute_remove", icon='REMOVE', text="") - class DATA_PT_custom_props_hair(DataButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'} _context_path = "object.data" diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index 64bc694d5ca..ee41cfc28a5 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -478,7 +478,15 @@ class DATA_PT_sculpt_vertex_colors(MeshButtonsPanel, Panel): row = layout.row() col = row.column() - col.template_list("MESH_UL_vcols", "svcols", me, "sculpt_vertex_colors", me.sculpt_vertex_colors, "active_index", rows=2) + col.template_list( + "MESH_UL_vcols", + "svcols", + me, + "sculpt_vertex_colors", + me.sculpt_vertex_colors, + "active_index", + rows=2, + ) col = row.column(align=True) col.operator("mesh.sculpt_vertex_color_add", icon='ADD', text="") diff --git a/release/scripts/startup/bl_ui/properties_data_pointcloud.py b/release/scripts/startup/bl_ui/properties_data_pointcloud.py index d7ff7389fc3..f2464fb9765 100644 --- a/release/scripts/startup/bl_ui/properties_data_pointcloud.py +++ b/release/scripts/startup/bl_ui/properties_data_pointcloud.py @@ -56,7 +56,7 @@ class POINTCLOUD_MT_add_attribute(Menu): @staticmethod def add_standard_attribute(layout, pointcloud, name, data_type, domain): - exists = pointcloud.attributes.get(name) != None + exists = pointcloud.attributes.get(name) is not None col = layout.column() col.enabled = not exists @@ -105,14 +105,21 @@ class DATA_PT_pointcloud_attributes(DataButtonsPanel, Panel): row = layout.row() col = row.column() - col.template_list("POINTCLOUD_UL_attributes", "attributes", pointcloud, "attributes", pointcloud.attributes, "active_index", rows=3) + col.template_list( + "POINTCLOUD_UL_attributes", + "attributes", + pointcloud, + "attributes", + pointcloud.attributes, + "active_index", + rows=3, + ) col = row.column(align=True) col.menu("POINTCLOUD_MT_add_attribute", icon='ADD', text="") col.operator("geometry.attribute_remove", icon='REMOVE', text="") - class DATA_PT_custom_props_pointcloud(DataButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'} _context_path = "object.data" diff --git a/release/scripts/startup/bl_ui/properties_data_volume.py b/release/scripts/startup/bl_ui/properties_data_volume.py index 6032d0ab859..af2c94ad423 100644 --- a/release/scripts/startup/bl_ui/properties_data_volume.py +++ b/release/scripts/startup/bl_ui/properties_data_volume.py @@ -77,10 +77,10 @@ class DATA_PT_volume_file(DataButtonsPanel, Panel): error_msg = volume.grids.error_message if len(error_msg): - layout.separator() - col = layout.column(align=True) - col.label(text="Failed to load volume:") - col.label(text=error_msg) + layout.separator() + col = layout.column(align=True) + col.label(text="Failed to load volume:") + col.label(text=error_msg) class VOLUME_UL_grids(UIList): diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index 54b1ca3d910..3a2b26aaebb 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -33,7 +33,7 @@ class RenderFreestyleButtonsPanel: def poll(cls, context): scene = context.scene with_freestyle = bpy.app.build_options.freestyle - return scene and with_freestyle and(context.engine in cls.COMPAT_ENGINES) + return scene and with_freestyle and (context.engine in cls.COMPAT_ENGINES) class RENDER_PT_freestyle(RenderFreestyleButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index f16528103ff..4107768a1c4 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -293,12 +293,12 @@ class GPENCIL_MT_snap_pie(Menu): "gpencil.snap_to_cursor", text="Selection to Cursor", icon='RESTRICT_SELECT_OFF' - ).use_offset = False + ).use_offset = False pie.operator( "gpencil.snap_to_cursor", text="Selection to Cursor (Keep Offset)", icon='RESTRICT_SELECT_OFF' - ).use_offset = True + ).use_offset = True pie.separator() pie.operator("view3d.snap_cursor_to_center", text="Cursor to World Origin", icon='CURSOR') pie.separator() @@ -814,7 +814,7 @@ class GPENCIL_MT_layer_mask_menu(Menu): for gpl in gpd.layers: if gpl != gpl_active and gpl.info not in gpl_active.mask_layers: done = True - layout.operator("gpencil.layer_mask_add", text=gpl.info).name=gpl.info + layout.operator("gpencil.layer_mask_add", text=gpl.info).name = gpl.info if done is False: layout.label(text="No layers to add") @@ -841,7 +841,7 @@ class GreasePencilLayerMasksPanel: row = layout.row() col = row.column() col.template_list("GPENCIL_UL_masks", "", gpl, "mask_layers", gpl.mask_layers, - "active_mask_index", rows=rows, sort_lock=True) + "active_mask_index", rows=rows, sort_lock=True) col2 = row.column(align=True) col2.menu("GPENCIL_MT_layer_mask_menu", icon='ADD', text="") diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index 9f84751e835..e18651d8e8a 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -549,8 +549,8 @@ def brush_settings(layout, context, brush, popover=False): row = layout.row(align=True) row.prop(brush, "hardness", slider=True) - row.prop(brush, "invert_hardness_pressure", text = "") - row.prop(brush, "use_hardness_pressure", text = "") + row.prop(brush, "invert_hardness_pressure", text="") + row.prop(brush, "use_hardness_pressure", text="") # auto_smooth_factor and use_inverse_smooth_pressure if capabilities.has_auto_smooth: @@ -648,9 +648,9 @@ def brush_settings(layout, context, brush, popover=False): layout.prop(brush, "pose_offset") layout.prop(brush, "pose_smooth_iterations") if brush.pose_deform_type == 'ROTATE_TWIST' and brush.pose_origin_type in {'TOPOLOGY', 'FACE_SETS'}: - layout.prop(brush, "pose_ik_segments") + layout.prop(brush, "pose_ik_segments") if brush.pose_deform_type == 'SCALE_TRANSLATE': - layout.prop(brush, "use_pose_lock_rotation") + layout.prop(brush, "use_pose_lock_rotation") layout.prop(brush, "use_pose_ik_anchored") layout.prop(brush, "use_connected_only") layout.prop(brush, "disconnected_distance_max") @@ -698,23 +698,23 @@ def brush_settings(layout, context, brush, popover=False): elif sculpt_tool == 'PAINT': row = layout.row(align=True) row.prop(brush, "flow") - row.prop(brush, "invert_flow_pressure", text = "") - row.prop(brush, "use_flow_pressure", text= "") + row.prop(brush, "invert_flow_pressure", text="") + row.prop(brush, "use_flow_pressure", text="") row = layout.row(align=True) row.prop(brush, "wet_mix") - row.prop(brush, "invert_wet_mix_pressure", text = "") - row.prop(brush, "use_wet_mix_pressure", text = "") + row.prop(brush, "invert_wet_mix_pressure", text="") + row.prop(brush, "use_wet_mix_pressure", text="") row = layout.row(align=True) row.prop(brush, "wet_persistence") - row.prop(brush, "invert_wet_persistence_pressure", text ="") - row.prop(brush, "use_wet_persistence_pressure", text= "") + row.prop(brush, "invert_wet_persistence_pressure", text="") + row.prop(brush, "use_wet_persistence_pressure", text="") row = layout.row(align=True) row.prop(brush, "density") - row.prop(brush, "invert_density_pressure", text = "") - row.prop(brush, "use_density_pressure", text = "") + row.prop(brush, "invert_density_pressure", text="") + row.prop(brush, "use_density_pressure", text="") row = layout.row() row.prop(brush, "tip_roundness") @@ -1218,7 +1218,7 @@ def brush_basic_gpencil_paint_settings(layout, context, brush, *, compact=False) if gp_settings.use_pressure and context.area.type == 'PROPERTIES': col = layout.column() col.template_curve_mapping(gp_settings, "curve_sensitivity", brush=True, - use_negative_slope=True) + use_negative_slope=True) row = layout.row(align=True) row.prop(gp_settings, "pen_strength", slider=True) @@ -1227,7 +1227,7 @@ def brush_basic_gpencil_paint_settings(layout, context, brush, *, compact=False) if gp_settings.use_strength_pressure and context.area.type == 'PROPERTIES': col = layout.column() col.template_curve_mapping(gp_settings, "curve_strength", brush=True, - use_negative_slope=True) + use_negative_slope=True) if brush.gpencil_tool == 'TINT': row = layout.row(align=True) diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 888eb40e27e..cdbd7f75193 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -1232,7 +1232,10 @@ class PHYSICS_PT_export(PhysicButtonsPanel, Panel): @classmethod def poll(cls, context): domain = context.fluid.domain_settings - if not PhysicButtonsPanel.poll_fluid_domain(context) or (domain.cache_data_format != 'OPENVDB' and bpy.app.debug_value != 3001): + if ( + not PhysicButtonsPanel.poll_fluid_domain(context) or + (domain.cache_data_format != 'OPENVDB' and bpy.app.debug_value != 3001) + ): return False return (context.engine in cls.COMPAT_ENGINES) diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index 23734601570..a9bb2e79762 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -43,7 +43,7 @@ class FILEBROWSER_HT_header(Header): class FILEBROWSER_PT_display(Panel): bl_space_type = 'FILE_BROWSER' bl_region_type = 'HEADER' - bl_label = "Display Settings" # Shows as tooltip in popover + bl_label = "Display Settings" # Shows as tooltip in popover bl_ui_units_x = 10 @classmethod @@ -76,7 +76,7 @@ class FILEBROWSER_PT_display(Panel): class FILEBROWSER_PT_filter(Panel): bl_space_type = 'FILE_BROWSER' bl_region_type = 'HEADER' - bl_label = "Filter Settings" # Shows as tooltip in popover + bl_label = "Filter Settings" # Shows as tooltip in popover bl_ui_units_x = 8 @classmethod diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 2519b5a2f40..300f367ab27 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -1022,7 +1022,7 @@ class IMAGE_PT_view_display_uv_edit_overlays(Panel): col = layout.column() if context.preferences.experimental.use_image_editor_legacy_drawing: - col.prop(uvedit, "show_smooth_edges", text="Smooth") + col.prop(uvedit, "show_smooth_edges", text="Smooth") col.prop(uvedit, "show_modified_edges", text="Modified") col.prop(uvedit, "uv_opacity") diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py index 4f518d8e2d4..9e588acd50f 100644 --- a/release/scripts/startup/bl_ui/space_text.py +++ b/release/scripts/startup/bl_ui/space_text.py @@ -177,7 +177,7 @@ class TEXT_PT_find(Panel): row = col.row(align=True) row.operator("text.replace") - row.operator("text.replace", text = "Replace all").all = True + row.operator("text.replace", text="Replace all").all = True layout.separator() diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index e6dcfa0a7ab..e021433bee3 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -50,7 +50,7 @@ def generate_from_enum_ex( attr, cursor='DEFAULT', tooldef_keywords={}, - exclude_filter = {} + exclude_filter={} ): tool_defs = [] for enum in type.bl_rna.properties[attr].enum_items_static: @@ -787,7 +787,6 @@ class _defs_edit_mesh: col.prop(props, "mark_seam", text="Seam") col.prop(props, "mark_sharp", text="Sharp") - col = layout.column() col.active = edge_bevel col.prop(props, "miter_outer", text="Miter Outer") @@ -1215,7 +1214,7 @@ class _defs_sculpt: icon_prefix="brush.sculpt.", type=bpy.types.Brush, attr="sculpt_tool", - exclude_filter = exclude_filter, + exclude_filter=exclude_filter, ) @ToolDef.from_fn @@ -2079,10 +2078,10 @@ class _defs_gpencil_edit: @ToolDef.from_fn def transform_fill(): def draw_settings(context, layout, tool): - props = tool.operator_properties("gpencil.transform_fill") - row = layout.row() - row.use_property_split = False - row.prop(props, "mode", expand=True) + props = tool.operator_properties("gpencil.transform_fill") + row = layout.row() + row.use_property_split = False + row.prop(props, "mode", expand=True) return dict( idname="builtin.transform_fill", @@ -2094,6 +2093,7 @@ class _defs_gpencil_edit: draw_settings=draw_settings, ) + class _defs_gpencil_sculpt: @staticmethod @@ -2291,6 +2291,7 @@ class _defs_sequencer_select: widget=None, keymap="Sequencer Tool: Select", ) + @ToolDef.from_fn def box(): def draw_settings(_context, layout, tool): @@ -2858,6 +2859,8 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel): ), ], } + + class SEQUENCER_PT_tools_active(ToolSelectPanelHelper, Panel): bl_space_type = 'SEQUENCE_EDITOR' bl_region_type = 'TOOLS' diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 4f814802705..c6fad77352c 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -276,9 +276,8 @@ class _draw_tool_settings_context_mode: layout.row().prop(brush, "direction", expand=True, text="") if capabilities.has_color: - UnifiedPaintPanel.prop_unified_color(layout, context, brush, "color", text = "") - layout.prop(brush, "blend", text="", expand = False) - + UnifiedPaintPanel.prop_unified_color(layout, context, brush, "color", text="") + layout.prop(brush, "blend", text="", expand=False) return True @@ -1135,7 +1134,7 @@ class VIEW3D_MT_view(Menu): props = layout.operator("render.opengl", text="Viewport Render Keyframes", icon='RENDER_ANIMATION', - ) + ) props.animation = True props.render_keyed_only = True @@ -3132,6 +3131,7 @@ class VIEW3D_MT_sculpt_set_pivot(Menu): props = layout.operator("sculpt.set_pivot_position", text="Pivot to Surface Under Cursor") props.mode = 'SURFACE' + class VIEW3D_MT_face_sets_init(Menu): bl_label = "Face Sets Init" @@ -5383,7 +5383,6 @@ class VIEW3D_PT_view3d_properties(Panel): layout.use_property_split = True layout.use_property_decorate = False # No animation. - col = layout.column() subcol = col.column() @@ -6592,7 +6591,7 @@ class VIEW3D_PT_proportional_edit(Panel): tool_settings = context.tool_settings col = layout.column() col.active = (tool_settings.use_proportional_edit_objects if context.mode == 'OBJECT' - else tool_settings.use_proportional_edit) + else tool_settings.use_proportional_edit) if context.mode != 'OBJECT': col.prop(tool_settings, "use_proportional_connected") @@ -6772,7 +6771,7 @@ class VIEW3D_PT_overlay_gpencil_options(Panel): col = split.column() col.prop(overlay, "use_gpencil_show_directions") col = split.column() - col.prop(overlay, "use_gpencil_show_material_name", text="Material Name") + col.prop(overlay, "use_gpencil_show_material_name", text="Material Name") layout.prop(overlay, "vertex_opacity", text="Vertex Opacity", slider=True) @@ -7059,26 +7058,26 @@ class VIEW3D_MT_gpencil_edit_context_menu(Menu): def draw_gpencil_layer_active(context, layout): - gpl = context.active_gpencil_layer - if gpl: - layout.label(text="Active Layer") - row = layout.row(align=True) - row.operator_context = 'EXEC_REGION_WIN' - row.operator_menu_enum("gpencil.layer_change", "layer", text="", icon='GREASEPENCIL') - row.prop(gpl, "info", text="") - row.operator("gpencil.layer_remove", text="", icon='X') + gpl = context.active_gpencil_layer + if gpl: + layout.label(text="Active Layer") + row = layout.row(align=True) + row.operator_context = 'EXEC_REGION_WIN' + row.operator_menu_enum("gpencil.layer_change", "layer", text="", icon='GREASEPENCIL') + row.prop(gpl, "info", text="") + row.operator("gpencil.layer_remove", text="", icon='X') def draw_gpencil_material_active(context, layout): - ob = context.active_object - if ob and len(ob.material_slots) > 0 and ob.active_material_index >= 0: - ma = ob.material_slots[ob.active_material_index].material - if ma: - layout.label(text="Active Material") - row = layout.row(align=True) - row.operator_context = 'EXEC_REGION_WIN' - row.operator_menu_enum("gpencil.material_set", "slot", text="", icon='MATERIAL') - row.prop(ma, "name", text="") + ob = context.active_object + if ob and len(ob.material_slots) > 0 and ob.active_material_index >= 0: + ma = ob.material_slots[ob.active_material_index].material + if ma: + layout.label(text="Active Material") + row = layout.row(align=True) + row.operator_context = 'EXEC_REGION_WIN' + row.operator_menu_enum("gpencil.material_set", "slot", text="", icon='MATERIAL') + row.prop(ma, "name", text="") class VIEW3D_PT_gpencil_sculpt_context_menu(Panel): @@ -7396,6 +7395,7 @@ class TOPBAR_PT_gpencil_vertexcolor(GreasePencilVertexcolorPanel, Panel): ob = context.object return ob and ob.type == 'GPENCIL' + classes = ( VIEW3D_HT_header, VIEW3D_HT_tool_header, diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 5f668bbc881..e9118a8be91 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1599,7 +1599,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel): row.prop(gp_settings, "use_random_press_radius", text="", icon='STYLUS_PRESSURE') if gp_settings.use_random_press_radius and self.is_popover is False: col.template_curve_mapping(gp_settings, "curve_random_pressure", brush=True, - use_negative_slope=True) + use_negative_slope=True) row = col.row(align=True) row.prop(gp_settings, "random_strength", text="Strength", slider=True) @@ -1607,7 +1607,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel): row.prop(gp_settings, "use_random_press_strength", text="", icon='STYLUS_PRESSURE') if gp_settings.use_random_press_strength and self.is_popover is False: col.template_curve_mapping(gp_settings, "curve_random_strength", brush=True, - use_negative_slope=True) + use_negative_slope=True) row = col.row(align=True) row.prop(gp_settings, "uv_random", text="UV", slider=True) @@ -1615,7 +1615,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel): row.prop(gp_settings, "use_random_press_uv", text="", icon='STYLUS_PRESSURE') if gp_settings.use_random_press_uv and self.is_popover is False: col.template_curve_mapping(gp_settings, "curve_random_uv", brush=True, - use_negative_slope=True) + use_negative_slope=True) col.separator() @@ -1627,7 +1627,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel): row.prop(gp_settings, "use_random_press_hue", text="", icon='STYLUS_PRESSURE') if gp_settings.use_random_press_hue and self.is_popover is False: col1.template_curve_mapping(gp_settings, "curve_random_hue", brush=True, - use_negative_slope=True) + use_negative_slope=True) row = col1.row(align=True) row.prop(gp_settings, "random_saturation_factor", slider=True) @@ -1635,7 +1635,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel): row.prop(gp_settings, "use_random_press_sat", text="", icon='STYLUS_PRESSURE') if gp_settings.use_random_press_sat and self.is_popover is False: col1.template_curve_mapping(gp_settings, "curve_random_saturation", brush=True, - use_negative_slope=True) + use_negative_slope=True) row = col1.row(align=True) row.prop(gp_settings, "random_value_factor", slider=True) @@ -1643,7 +1643,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel): row.prop(gp_settings, "use_random_press_val", text="", icon='STYLUS_PRESSURE') if gp_settings.use_random_press_val and self.is_popover is False: col1.template_curve_mapping(gp_settings, "curve_random_value", brush=True, - use_negative_slope=True) + use_negative_slope=True) col.separator() @@ -1652,7 +1652,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel): row.prop(gp_settings, "use_jitter_pressure", text="", icon='STYLUS_PRESSURE') if gp_settings.use_jitter_pressure and self.is_popover is False: col.template_curve_mapping(gp_settings, "curve_jitter", brush=True, - use_negative_slope=True) + use_negative_slope=True) class VIEW3D_PT_tools_grease_pencil_brush_paint_falloff(GreasePencilBrushFalloff, Panel, View3DPaintPanel): |