diff options
Diffstat (limited to 'space_view3d_brush_menus')
-rw-r--r-- | space_view3d_brush_menus/__init__.py | 12 | ||||
-rw-r--r-- | space_view3d_brush_menus/brush_menu.py | 30 | ||||
-rw-r--r-- | space_view3d_brush_menus/brushes.py | 2 |
3 files changed, 22 insertions, 22 deletions
diff --git a/space_view3d_brush_menus/__init__.py b/space_view3d_brush_menus/__init__.py index 1a8d677a..dbc16a5e 100644 --- a/space_view3d_brush_menus/__init__.py +++ b/space_view3d_brush_menus/__init__.py @@ -69,12 +69,12 @@ addon_files = ( symmetry_menu, texture_menu, ) - + class VIEW3D_MT_Brushes_Pref(AddonPreferences): bl_idname = __name__ - + column_set: IntProperty( name="Number of Columns", description="Number of columns used for the brushes menu", @@ -99,10 +99,10 @@ def register(): # register all files for addon_file in addon_files: addon_file.register() - + # set the add-on name variable to access the preferences utils_core.get_addon_name = __name__ - + # register preferences bpy.utils.register_class(VIEW3D_MT_Brushes_Pref) @@ -121,10 +121,10 @@ def unregister(): # unregister all files for addon_file in addon_files: addon_file.unregister() - + # unregister preferences bpy.utils.unregister_class(VIEW3D_MT_Brushes_Pref) - + for km, kmi in addon_keymaps: km.keymap_items.remove(kmi) addon_keymaps.clear() diff --git a/space_view3d_brush_menus/brush_menu.py b/space_view3d_brush_menus/brush_menu.py index 339a211c..ee7eff25 100644 --- a/space_view3d_brush_menus/brush_menu.py +++ b/space_view3d_brush_menus/brush_menu.py @@ -25,7 +25,7 @@ class BrushOptionsMenu(Menu): def draw(self, context): mode = utils_core.get_mode() layout = self.layout - + # add generic menu items layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("wm.search_menu", text="Search", icon='VIEWZOOM') @@ -34,8 +34,8 @@ class BrushOptionsMenu(Menu): layout.operator_menu_enum("object.mode_set", "mode", text="Interactive Mode", icon='VIEW3D') layout.separator() - - + + # add mode specific menu items if mode == 'SCULPT': self.sculpt(mode, layout, context) @@ -53,7 +53,7 @@ class BrushOptionsMenu(Menu): has_brush = utils_core.get_brush_link(context, types="brush") icons = brushes.brush_icon[mode][has_brush.sculpt_tool] if \ has_brush else "BRUSH_DATA" - + layout.row().menu("VIEW3D_MT_sv3_brushes_menu", icon=icons) @@ -75,8 +75,8 @@ class BrushOptionsMenu(Menu): has_brush = utils_core.get_brush_link(context, types="brush") icons = brushes.brush_icon[mode][has_brush.vertex_tool] if \ has_brush else "BRUSH_DATA" - - if mode == 'VERTEX_PAINT': + + if mode == 'VERTEX_PAINT': layout.row().operator(ColorPickerPopup.bl_idname, icon="COLOR") layout.row().separator() @@ -107,7 +107,7 @@ class BrushOptionsMenu(Menu): def texpaint(self, mode, layout, context): toolsettings = context.tool_settings.image_paint - + has_brush = utils_core.get_brush_link(context, types="brush") icons = brushes.brush_icon[mode][has_brush.image_tool] if \ has_brush else "BRUSH_DATA" @@ -116,36 +116,36 @@ class BrushOptionsMenu(Menu): if toolsettings.missing_uvs: layout.row().label(text="Missing UVs", icon='ERROR') layout.row().operator("paint.add_simple_uvs") - + return - + elif toolsettings.missing_materials or toolsettings.missing_texture: layout.row().label(text="Missing Data", icon='ERROR') layout.row().operator_menu_enum("paint.add_texture_paint_slot", \ "type", \ icon='ADD', \ text="Add Texture Paint Slot") - + return - + elif toolsettings.missing_stencil: layout.row().label(text="Missing Data", icon='ERROR') layout.row().label(text="See Mask Properties", icon='FORWARD') layout.row().separator() layout.row().menu("VIEW3D_MT_sv3_brushes_menu", icon=icons) - + return - + else: layout.row().label(text="Missing Data", icon="INFO") - + else: if has_brush and has_brush.image_tool in {'DRAW', 'FILL'} and \ has_brush.blend not in {'ERASE_ALPHA', 'ADD_ALPHA'}: layout.row().operator(ColorPickerPopup.bl_idname, icon="COLOR") layout.row().separator() - + layout.row().menu("VIEW3D_MT_sv3_brushes_menu", icon=icons) diff --git a/space_view3d_brush_menus/brushes.py b/space_view3d_brush_menus/brushes.py index 4d99b7d5..0d70227d 100644 --- a/space_view3d_brush_menus/brushes.py +++ b/space_view3d_brush_menus/brushes.py @@ -110,7 +110,7 @@ class BrushesMenu(Menu): ) else: column_flow = layout.column_flow(columns=colum_n) - + # iterate over all the brushes for item in bpy.data.brushes: if mode == 'SCULPT': |