2009-11-01 15:21:20 +00:00
|
|
|
# ##### BEGIN GPL LICENSE BLOCK #####
|
|
|
|
#
|
|
|
|
# This program is free software; you can redistribute it and/or
|
|
|
|
# modify it under the terms of the GNU General Public License
|
|
|
|
# as published by the Free Software Foundation; either version 2
|
|
|
|
# of the License, or (at your option) any later version.
|
2009-11-03 07:23:02 +00:00
|
|
|
#
|
2009-11-01 15:21:20 +00:00
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
2009-11-03 07:23:02 +00:00
|
|
|
#
|
2009-11-01 15:21:20 +00:00
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this program; if not, write to the Free Software Foundation,
|
2010-02-12 13:34:04 +00:00
|
|
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2009-11-01 15:21:20 +00:00
|
|
|
#
|
|
|
|
# ##### END GPL LICENSE BLOCK #####
|
2009-10-31 20:16:59 +00:00
|
|
|
|
2009-10-31 23:35:56 +00:00
|
|
|
# <pep8 compliant>
|
2014-07-21 12:02:05 +02:00
|
|
|
from bpy.types import Menu, Panel, UIList
|
2019-06-11 16:08:32 +10:00
|
|
|
from bl_ui.properties_grease_pencil_common import (
|
2018-09-21 20:15:25 +02:00
|
|
|
GreasePencilSculptOptionsPanel,
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
GreasePencilDisplayPanel,
|
2020-03-09 16:27:24 +01:00
|
|
|
GreasePencilBrushFalloff,
|
2018-07-31 21:06:08 +10:00
|
|
|
)
|
2019-06-11 16:08:32 +10:00
|
|
|
from bl_ui.properties_paint_common import (
|
2018-07-31 21:06:08 +10:00
|
|
|
UnifiedPaintPanel,
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
BrushSelectPanel,
|
|
|
|
ClonePanel,
|
|
|
|
TextureMaskPanel,
|
|
|
|
ColorPalettePanel,
|
|
|
|
StrokePanel,
|
|
|
|
SmoothStrokePanel,
|
|
|
|
FalloffPanel,
|
|
|
|
DisplayPanel,
|
2019-01-02 14:36:56 +11:00
|
|
|
brush_texture_settings,
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
brush_mask_texture_settings,
|
|
|
|
brush_settings,
|
|
|
|
brush_settings_advanced,
|
|
|
|
draw_color_settings,
|
2018-07-31 21:06:08 +10:00
|
|
|
)
|
2019-03-13 12:41:22 +11:00
|
|
|
from bl_ui.utils import PresetPanel
|
2009-07-02 11:24:27 +00:00
|
|
|
|
2011-06-24 03:30:50 +00:00
|
|
|
|
2019-08-08 22:54:57 +02:00
|
|
|
class VIEW3D_MT_brush_context_menu(Menu):
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_label = "Brush Specials"
|
2019-08-08 22:54:57 +02:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
|
|
|
settings = UnifiedPaintPanel.paint_settings(context)
|
|
|
|
brush = getattr(settings, "brush", None)
|
|
|
|
|
|
|
|
# skip if no active brush
|
|
|
|
if not brush:
|
|
|
|
layout.label(text="No Brushes currently available", icon='INFO')
|
|
|
|
return
|
|
|
|
|
|
|
|
# brush paint modes
|
|
|
|
layout.menu("VIEW3D_MT_brush_paint_modes")
|
|
|
|
|
|
|
|
# brush tool
|
|
|
|
|
|
|
|
if context.image_paint_object:
|
|
|
|
layout.prop_menu_enum(brush, "image_tool")
|
|
|
|
elif context.vertex_paint_object:
|
|
|
|
layout.prop_menu_enum(brush, "vertex_tool")
|
|
|
|
elif context.weight_paint_object:
|
|
|
|
layout.prop_menu_enum(brush, "weight_tool")
|
|
|
|
elif context.sculpt_object:
|
|
|
|
layout.prop_menu_enum(brush, "sculpt_tool")
|
|
|
|
layout.operator("brush.reset")
|
|
|
|
|
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
class VIEW3D_MT_brush_gpencil_context_menu(Menu):
|
|
|
|
bl_label = "Brush Specials"
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
ts = context.tool_settings
|
|
|
|
|
|
|
|
settings = None
|
|
|
|
if context.mode == 'PAINT_GPENCIL':
|
|
|
|
settings = ts.gpencil_paint
|
|
|
|
if context.mode == 'SCULPT_GPENCIL':
|
|
|
|
settings = ts.gpencil_sculpt_paint
|
|
|
|
elif context.mode == 'WEIGHT_GPENCIL':
|
|
|
|
settings = ts.gpencil_weight_paint
|
|
|
|
elif context.mode == 'VERTEX_GPENCIL':
|
|
|
|
settings = ts.gpencil_vertex_paint
|
|
|
|
|
|
|
|
brush = getattr(settings, "brush", None)
|
|
|
|
# skip if no active brush
|
|
|
|
if not brush:
|
|
|
|
layout.label(text="No Brushes currently available", icon='INFO')
|
|
|
|
return
|
|
|
|
|
|
|
|
layout.operator("gpencil.brush_reset")
|
|
|
|
layout.operator("gpencil.brush_reset_all")
|
|
|
|
|
|
|
|
|
2019-08-08 22:54:57 +02:00
|
|
|
class VIEW3D_MT_brush_context_menu_paint_modes(Menu):
|
|
|
|
bl_label = "Enabled Modes"
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
|
|
|
settings = UnifiedPaintPanel.paint_settings(context)
|
|
|
|
brush = settings.brush
|
|
|
|
|
|
|
|
layout.prop(brush, "use_paint_sculpt", text="Sculpt")
|
|
|
|
layout.prop(brush, "use_paint_uv_sculpt", text="UV Sculpt")
|
|
|
|
layout.prop(brush, "use_paint_vertex", text="Vertex Paint")
|
|
|
|
layout.prop(brush, "use_paint_weight", text="Weight Paint")
|
|
|
|
layout.prop(brush, "use_paint_image", text="Texture Paint")
|
|
|
|
|
|
|
|
|
2015-01-29 15:35:06 +11:00
|
|
|
class View3DPanel:
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_space_type = 'VIEW_3D'
|
|
|
|
bl_region_type = 'UI'
|
2009-08-15 19:40:09 +00:00
|
|
|
|
2009-10-31 23:35:56 +00:00
|
|
|
|
Grease Pencil Todos: "Sketching Sessions"
Due to popular request and usability considerations, this commit
reintroduces functionality similar to 2.4's "Draw Mode" for Grease
Pencil.
In the toolbar under the Draw/Line/Eraser buttons, you can find the
"Use Sketching Sessions" toggle, which enables this feature. This is a
per-scene setting, and defaults to off, so that the current 2.5
behaviour is still the default (i.e. the Grease Pencil operator will
only do a single stroke at a time).
With this option enabled, drawing with Grease Pencil will enter a
semi-modal state where you can draw multiple strokes without needing
to keep holding the DKEY throughout (though you'll still need to do so
to start the strokes, unless you use some toolbar buttons), while
still being able to manipulate the viewport. Header help-text prints
show the appropriate keybindings (i.e. press ESCKEY or ENTER to end
the sketching session).
Notes:
- To aid maintainability of the 3D-View toolbar code, I've taken the
liberty to factor out the groups of widgets which commonly occur in
most of the toolbars into separate functions (namely "Repeat" and
"Grease Pencil"). Perhaps it might make it slightly harder to newbies
to the toolbar code to grasp, though the physics panels are far worse
;)
- I've reshuffled some code in the Grease Pencil code to separate out
the various states of operation again more clearly, though some more
work is still needed there (TODO)
- There can now be only one Grease Pencil operator running at a time
- Redoing Grease Pencil operations where sketching sessions was
enabled still needs work. Namely, a way of delimiting the set of
points recorded into strokes is still needed (TODO)
- Ultimately, it should be possible to switch tools midway through a
session. Currently sessions are limited to only being able to be used
with a single drawing mode (TODO)
- After ending a drawing session, the titlebar contols may not work on
Windows without manually making the main window lose focus and then
regain (i.e. click on some other window in toolbar, then come back).
This may be related to (bug #25480)
2011-01-04 03:14:01 +00:00
|
|
|
# **************** standard tool clusters ******************
|
|
|
|
|
2017-09-28 01:38:17 +10:00
|
|
|
# Used by vertex & weight paint
|
|
|
|
def draw_vpaint_symmetry(layout, vpaint):
|
|
|
|
|
2018-06-10 15:55:19 +02:00
|
|
|
split = layout.split()
|
|
|
|
|
|
|
|
col = split.column()
|
|
|
|
col.alignment = 'RIGHT'
|
|
|
|
col.label(text="Mirror")
|
|
|
|
|
|
|
|
col = split.column()
|
|
|
|
row = col.row(align=True)
|
2017-09-28 01:38:17 +10:00
|
|
|
row.prop(vpaint, "use_symmetry_x", text="X", toggle=True)
|
|
|
|
row.prop(vpaint, "use_symmetry_y", text="Y", toggle=True)
|
|
|
|
row.prop(vpaint, "use_symmetry_z", text="Z", toggle=True)
|
|
|
|
|
|
|
|
col = layout.column()
|
2018-06-10 15:55:19 +02:00
|
|
|
col.use_property_split = True
|
2018-10-25 15:27:31 +02:00
|
|
|
col.use_property_decorate = False
|
2017-09-28 01:38:17 +10:00
|
|
|
col.prop(vpaint, "radial_symmetry", text="Radial")
|
|
|
|
|
2018-07-31 21:06:08 +10:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
# Most of these panels should not be visible in GP edit modes
|
2018-07-31 10:22:19 +02:00
|
|
|
def is_not_gpencil_edit_mode(context):
|
2018-07-31 21:06:08 +10:00
|
|
|
is_gpmode = (
|
|
|
|
context.active_object and
|
2018-12-14 16:45:57 +01:00
|
|
|
context.active_object.mode in {'EDIT_GPENCIL', 'PAINT_GPENCIL', 'SCULPT_GPENCIL', 'WEIGHT_GPENCIL'}
|
2018-07-31 21:06:08 +10:00
|
|
|
)
|
2018-07-31 10:22:19 +02:00
|
|
|
return not is_gpmode
|
|
|
|
|
2013-12-22 17:13:29 -06:00
|
|
|
|
2019-09-12 00:50:37 +10:00
|
|
|
# ********** default tools for object mode ****************
|
|
|
|
|
|
|
|
|
|
|
|
class VIEW3D_PT_tools_object_options(View3DPanel, Panel):
|
|
|
|
bl_category = "Tool"
|
|
|
|
bl_context = ".objectmode" # dot on purpose (access from topbar)
|
|
|
|
bl_label = "Options"
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
# layout = self.layout
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
|
|
class VIEW3D_PT_tools_object_options_transform(View3DPanel, Panel):
|
|
|
|
bl_category = "Tool"
|
|
|
|
bl_context = ".objectmode" # dot on purpose (access from topbar)
|
|
|
|
bl_label = "Transform"
|
|
|
|
bl_parent_id = "VIEW3D_PT_tools_object_options"
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
|
|
|
tool_settings = context.tool_settings
|
|
|
|
|
|
|
|
layout.label(text="Affect Only")
|
|
|
|
layout.prop(tool_settings, "use_transform_data_origin", text="Origins")
|
|
|
|
layout.prop(tool_settings, "use_transform_pivot_point_align", text="Locations")
|
2019-09-12 22:52:11 +10:00
|
|
|
layout.prop(tool_settings, "use_transform_skip_children", text="Parents")
|
2019-09-12 00:50:37 +10:00
|
|
|
|
|
|
|
|
2013-12-22 17:13:29 -06:00
|
|
|
# ********** default tools for editmode_mesh ****************
|
2009-10-31 23:35:56 +00:00
|
|
|
|
2014-02-13 08:51:33 +11:00
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class VIEW3D_PT_tools_meshedit_options(View3DPanel, Panel):
|
2019-05-16 22:13:28 +10:00
|
|
|
bl_category = "Tool"
|
2018-06-05 16:35:20 +02:00
|
|
|
bl_context = ".mesh_edit" # dot on purpose (access from topbar)
|
2019-03-20 14:09:55 +01:00
|
|
|
bl_label = "Options"
|
2019-05-21 22:50:02 +02:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2011-11-08 01:32:34 +00:00
|
|
|
|
2011-11-05 10:34:29 +00:00
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
return context.active_object
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
2018-08-30 09:05:48 +10:00
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
2009-11-04 16:26:08 +00:00
|
|
|
ob = context.active_object
|
2011-11-05 10:34:29 +00:00
|
|
|
mesh = ob.data
|
2011-11-05 10:19:36 +00:00
|
|
|
|
2019-09-11 13:48:42 -03:00
|
|
|
split = layout.split()
|
|
|
|
|
|
|
|
col = split.column()
|
|
|
|
col.alignment = 'RIGHT'
|
|
|
|
col.label(text="Mirror")
|
|
|
|
|
|
|
|
col = split.column()
|
2011-03-10 05:52:16 +00:00
|
|
|
|
2013-08-23 20:41:21 +00:00
|
|
|
row = col.row(align=True)
|
2019-09-11 13:48:42 -03:00
|
|
|
row.prop(mesh, "use_mirror_x", text="X", toggle=True)
|
|
|
|
row.prop(mesh, "use_mirror_y", text="Y", toggle=True)
|
|
|
|
row.prop(mesh, "use_mirror_z", text="Z", toggle=True)
|
|
|
|
|
|
|
|
row = layout.row(align=True)
|
|
|
|
row.active = ob.data.use_mirror_x or ob.data.use_mirror_y or ob.data.use_mirror_z
|
2011-11-05 10:34:29 +00:00
|
|
|
row.prop(mesh, "use_mirror_topology")
|
2011-03-10 05:52:16 +00:00
|
|
|
|
2018-06-12 21:16:50 +02:00
|
|
|
|
2019-05-21 22:50:02 +02:00
|
|
|
class VIEW3D_PT_tools_meshedit_options_automerge(View3DPanel, Panel):
|
|
|
|
bl_category = "Tool"
|
|
|
|
bl_context = ".mesh_edit" # dot on purpose (access from topbar)
|
|
|
|
bl_label = "Auto Merge"
|
|
|
|
bl_parent_id = "VIEW3D_PT_tools_meshedit_options"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
return context.active_object
|
|
|
|
|
|
|
|
def draw_header(self, context):
|
|
|
|
tool_settings = context.tool_settings
|
|
|
|
|
|
|
|
self.layout.prop(tool_settings, "use_mesh_automerge", text="", toggle=False)
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
|
|
|
tool_settings = context.tool_settings
|
|
|
|
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
2019-09-13 09:27:59 -03:00
|
|
|
col = layout.column(align=True)
|
|
|
|
col.active = tool_settings.use_mesh_automerge
|
|
|
|
col.prop(tool_settings, "use_mesh_automerge_and_split", toggle=False)
|
|
|
|
col.prop(tool_settings, "double_threshold", text="Threshold")
|
2009-07-02 11:24:27 +00:00
|
|
|
|
|
|
|
# ********** default tools for editmode_curve ****************
|
|
|
|
|
2014-02-13 08:51:33 +11:00
|
|
|
|
2016-04-15 18:10:05 +10:00
|
|
|
class VIEW3D_PT_tools_curveedit_options_stroke(View3DPanel, Panel):
|
2019-05-16 22:13:28 +10:00
|
|
|
bl_category = "Tool"
|
2018-06-05 16:35:20 +02:00
|
|
|
bl_context = ".curve_edit" # dot on purpose (access from topbar)
|
2016-04-15 18:10:05 +10:00
|
|
|
bl_label = "Curve Stroke"
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
|
|
|
tool_settings = context.tool_settings
|
|
|
|
cps = tool_settings.curve_paint_settings
|
|
|
|
|
|
|
|
col = layout.column()
|
|
|
|
|
|
|
|
col.prop(cps, "curve_type")
|
|
|
|
|
|
|
|
if cps.curve_type == 'BEZIER':
|
2018-08-28 12:34:51 +10:00
|
|
|
col.label(text="Bezier Options:")
|
2016-04-15 18:10:05 +10:00
|
|
|
col.prop(cps, "error_threshold")
|
2016-07-25 14:14:31 +10:00
|
|
|
col.prop(cps, "fit_method")
|
2016-04-15 18:10:05 +10:00
|
|
|
col.prop(cps, "use_corners_detect")
|
|
|
|
|
|
|
|
col = layout.column()
|
|
|
|
col.active = cps.use_corners_detect
|
|
|
|
col.prop(cps, "corner_angle")
|
|
|
|
|
2018-08-28 12:34:51 +10:00
|
|
|
col.label(text="Pressure Radius:")
|
2016-04-15 18:10:05 +10:00
|
|
|
row = layout.row(align=True)
|
|
|
|
rowsub = row.row(align=True)
|
|
|
|
rowsub.prop(cps, "radius_min", text="Min")
|
|
|
|
rowsub.prop(cps, "radius_max", text="Max")
|
|
|
|
|
|
|
|
row.prop(cps, "use_pressure_radius", text="", icon_only=True)
|
|
|
|
|
|
|
|
col = layout.column()
|
2018-08-28 12:34:51 +10:00
|
|
|
col.label(text="Taper Radius:")
|
2016-04-15 18:10:05 +10:00
|
|
|
row = layout.row(align=True)
|
|
|
|
row.prop(cps, "radius_taper_start", text="Start")
|
|
|
|
row.prop(cps, "radius_taper_end", text="End")
|
|
|
|
|
|
|
|
col = layout.column()
|
2018-08-28 12:34:51 +10:00
|
|
|
col.label(text="Projection Depth:")
|
2016-04-15 18:10:05 +10:00
|
|
|
row = layout.row(align=True)
|
|
|
|
row.prop(cps, "depth_mode", expand=True)
|
|
|
|
|
|
|
|
col = layout.column()
|
|
|
|
if cps.depth_mode == 'SURFACE':
|
2016-05-04 15:45:55 +10:00
|
|
|
col.prop(cps, "surface_offset")
|
|
|
|
col.prop(cps, "use_offset_absolute")
|
2016-04-15 18:10:05 +10:00
|
|
|
col.prop(cps, "use_stroke_endpoints")
|
|
|
|
if cps.use_stroke_endpoints:
|
|
|
|
colsub = layout.column(align=True)
|
|
|
|
colsub.prop(cps, "surface_plane", expand=True)
|
|
|
|
|
2016-08-01 11:54:02 +10:00
|
|
|
|
2009-07-02 11:24:27 +00:00
|
|
|
# ********** default tools for editmode_armature ****************
|
|
|
|
|
2009-10-31 23:35:56 +00:00
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class VIEW3D_PT_tools_armatureedit_options(View3DPanel, Panel):
|
2019-05-16 22:13:28 +10:00
|
|
|
bl_category = "Tool"
|
2018-04-25 08:16:21 +02:00
|
|
|
bl_context = ".armature_edit" # dot on purpose (access from topbar)
|
2019-05-16 22:13:28 +10:00
|
|
|
bl_label = "Options"
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
arm = context.active_object.data
|
2009-10-27 12:46:20 +00:00
|
|
|
|
2011-04-01 21:37:40 +00:00
|
|
|
self.layout.prop(arm, "use_mirror_x")
|
2009-07-24 21:01:41 +00:00
|
|
|
|
2014-04-17 14:50:06 +02:00
|
|
|
|
2011-10-17 06:58:07 +00:00
|
|
|
# ********** default tools for pose-mode ****************
|
2009-07-02 11:24:27 +00:00
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class VIEW3D_PT_tools_posemode_options(View3DPanel, Panel):
|
2019-05-16 22:13:28 +10:00
|
|
|
bl_category = "Tool"
|
2018-06-05 16:35:20 +02:00
|
|
|
bl_context = ".posemode" # dot on purpose (access from topbar)
|
2009-10-31 19:31:45 +00:00
|
|
|
bl_label = "Pose Options"
|
|
|
|
|
|
|
|
def draw(self, context):
|
2019-05-09 11:19:38 +02:00
|
|
|
pose = context.active_object.pose
|
2019-05-06 09:47:45 +02:00
|
|
|
layout = self.layout
|
2009-10-19 13:24:18 +00:00
|
|
|
|
2019-09-12 00:50:37 +10:00
|
|
|
tool_settings = context.tool_settings
|
|
|
|
|
2019-05-09 11:19:38 +02:00
|
|
|
layout.prop(pose, "use_auto_ik")
|
|
|
|
layout.prop(pose, "use_mirror_x")
|
2019-05-06 09:47:45 +02:00
|
|
|
col = layout.column()
|
2020-01-02 12:48:30 -03:00
|
|
|
col.active = pose.use_mirror_x and not pose.use_auto_ik
|
2019-05-09 11:19:38 +02:00
|
|
|
col.prop(pose, "use_mirror_relative")
|
2009-07-02 11:24:27 +00:00
|
|
|
|
2019-09-12 00:50:37 +10:00
|
|
|
layout.label(text="Affect Only")
|
|
|
|
layout.prop(tool_settings, "use_transform_pivot_point_align", text="Locations")
|
|
|
|
|
2009-07-24 11:14:59 +00:00
|
|
|
# ********** default tools for paint modes ****************
|
2009-07-02 11:24:27 +00:00
|
|
|
|
2019-12-16 14:29:03 +11:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class TEXTURE_UL_texpaintslots(UIList):
|
|
|
|
def draw_item(self, _context, layout, _data, item, icon, _active_data, _active_propname, _index):
|
|
|
|
# mat = data
|
2009-10-31 23:35:56 +00:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
if self.layout_type in {'DEFAULT', 'COMPACT'}:
|
|
|
|
layout.prop(item, "name", text="", emboss=False, icon_value=icon)
|
|
|
|
elif self.layout_type == 'GRID':
|
|
|
|
layout.alignment = 'CENTER'
|
|
|
|
layout.label(text="")
|
|
|
|
|
2019-12-16 14:29:03 +11:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class View3DPaintPanel(View3DPanel, UnifiedPaintPanel):
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
2009-07-20 16:39:16 +00:00
|
|
|
|
2019-03-20 10:44:13 +11:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class View3DPaintBrushPanel(View3DPaintPanel):
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
mode = cls.get_brush_mode(context)
|
|
|
|
return mode is not None
|
|
|
|
|
|
|
|
|
2019-03-18 21:30:56 +01:00
|
|
|
class VIEW3D_PT_tools_particlemode(Panel, View3DPaintPanel):
|
2018-04-30 16:59:16 +02:00
|
|
|
bl_context = ".paint_common" # dot on purpose (access from topbar)
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_label = "Particle Tool"
|
2019-03-18 21:30:56 +01:00
|
|
|
bl_options = {'HIDE_HEADER'}
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-08-09 01:37:09 +00:00
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
settings = context.tool_settings.particle_edit
|
2019-03-18 21:30:56 +01:00
|
|
|
return (settings and settings.brush and context.particle_edit_object)
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
settings = context.tool_settings.particle_edit
|
2009-10-31 19:31:45 +00:00
|
|
|
brush = settings.brush
|
2019-03-18 21:30:56 +01:00
|
|
|
tool = settings.tool
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2019-03-18 21:30:56 +01:00
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False # No animation.
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2019-03-20 10:44:13 +11:00
|
|
|
if tool is not None:
|
2019-03-18 21:30:56 +01:00
|
|
|
col = layout.column()
|
|
|
|
col.prop(brush, "size", slider=True)
|
|
|
|
if tool == 'ADD':
|
|
|
|
col.prop(brush, "count")
|
2011-10-12 00:47:50 +00:00
|
|
|
|
2018-08-02 22:10:38 +10:00
|
|
|
col = layout.column()
|
2019-03-18 21:30:56 +01:00
|
|
|
col.prop(settings, "use_default_interpolate")
|
|
|
|
col.prop(brush, "steps", slider=True)
|
|
|
|
col.prop(settings, "default_key_count", slider=True)
|
|
|
|
else:
|
|
|
|
col.prop(brush, "strength", slider=True)
|
|
|
|
|
|
|
|
if tool == 'LENGTH':
|
|
|
|
layout.row().prop(brush, "length_mode", expand=True)
|
|
|
|
elif tool == 'PUFF':
|
|
|
|
layout.row().prop(brush, "puff_mode", expand=True)
|
|
|
|
layout.prop(brush, "use_puff_volume")
|
|
|
|
elif tool == 'COMB':
|
|
|
|
layout.prop(settings, "use_emitter_deflect", text="Deflect Emitter")
|
2018-08-29 15:45:51 +10:00
|
|
|
col = layout.column()
|
2019-03-18 21:30:56 +01:00
|
|
|
col.active = settings.use_emitter_deflect
|
|
|
|
col.prop(settings, "emitter_distance", text="Distance")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
|
2019-03-18 21:30:56 +01:00
|
|
|
# TODO, move to space_view3d.py
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class VIEW3D_PT_tools_brush_select(Panel, View3DPaintBrushPanel, BrushSelectPanel):
|
|
|
|
bl_context = ".paint_common"
|
|
|
|
bl_label = "Brushes"
|
2009-10-31 19:31:45 +00:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
|
|
|
# TODO, move to space_view3d.py
|
|
|
|
class VIEW3D_PT_tools_brush_settings(Panel, View3DPaintBrushPanel):
|
|
|
|
bl_context = ".paint_common"
|
|
|
|
bl_label = "Brush Settings"
|
2019-03-18 21:30:56 +01:00
|
|
|
|
2019-12-19 18:12:10 +11:00
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
settings = cls.paint_settings(context)
|
|
|
|
return settings and settings.brush is not None
|
|
|
|
|
2019-03-18 21:30:56 +01:00
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
2019-03-19 18:17:50 +01:00
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False # No animation.
|
|
|
|
|
2019-03-18 21:30:56 +01:00
|
|
|
settings = self.paint_settings(context)
|
|
|
|
brush = settings.brush
|
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
brush_settings(layout.column(), context, brush, popover=self.is_popover)
|
2010-07-14 14:11:03 +00:00
|
|
|
|
2019-12-16 14:29:03 +11:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class VIEW3D_PT_tools_brush_settings_advanced(Panel, View3DPaintBrushPanel):
|
|
|
|
bl_context = ".paint_common"
|
|
|
|
bl_parent_id = "VIEW3D_PT_tools_brush_settings"
|
|
|
|
bl_label = "Advanced"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2010-07-22 18:56:46 +00:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
2012-06-20 09:34:26 +00:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False # No animation.
|
2019-01-02 14:36:56 +11:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
settings = UnifiedPaintPanel.paint_settings(context)
|
|
|
|
brush = settings.brush
|
2019-08-12 11:37:24 +02:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
brush_settings_advanced(layout.column(), context, brush, self.is_popover)
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2012-06-20 09:34:26 +00:00
|
|
|
|
2019-03-19 18:17:50 +01:00
|
|
|
class VIEW3D_PT_tools_brush_color(Panel, View3DPaintPanel):
|
|
|
|
bl_context = ".paint_common" # dot on purpose (access from topbar)
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_parent_id = "VIEW3D_PT_tools_brush_settings"
|
2019-03-19 18:17:50 +01:00
|
|
|
bl_label = "Color Picker"
|
|
|
|
|
|
|
|
@classmethod
|
2019-04-19 07:36:07 +02:00
|
|
|
def poll(cls, context):
|
|
|
|
settings = cls.paint_settings(context)
|
2019-03-19 18:17:50 +01:00
|
|
|
brush = settings.brush
|
2019-12-16 14:29:03 +11:00
|
|
|
|
2019-03-19 19:31:36 +01:00
|
|
|
if context.image_paint_object:
|
|
|
|
capabilities = brush.image_paint_capabilities
|
2019-03-19 19:42:17 +01:00
|
|
|
return capabilities.has_color
|
2019-03-19 19:31:36 +01:00
|
|
|
elif context.vertex_paint_object:
|
|
|
|
capabilities = brush.vertex_paint_capabilities
|
2019-03-19 19:42:17 +01:00
|
|
|
return capabilities.has_color
|
2019-03-19 18:17:50 +01:00
|
|
|
|
2019-12-16 14:29:03 +11:00
|
|
|
return False
|
|
|
|
|
2019-03-19 18:17:50 +01:00
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
settings = self.paint_settings(context)
|
|
|
|
brush = settings.brush
|
|
|
|
|
2019-12-16 14:29:03 +11:00
|
|
|
draw_color_settings(context, layout, brush, color_type=not context.vertex_paint_object)
|
2019-08-04 11:53:48 -04:00
|
|
|
|
2019-03-19 18:17:50 +01:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class VIEW3D_PT_tools_brush_swatches(Panel, View3DPaintPanel, ColorPalettePanel):
|
|
|
|
bl_context = ".paint_common"
|
|
|
|
bl_parent_id = "VIEW3D_PT_tools_brush_settings"
|
2019-03-19 18:17:50 +01:00
|
|
|
bl_label = "Color Palette"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class VIEW3D_PT_tools_brush_clone(Panel, View3DPaintPanel, ClonePanel):
|
|
|
|
bl_context = ".paint_common"
|
|
|
|
bl_parent_id = "VIEW3D_PT_tools_brush_settings"
|
2019-03-19 18:17:50 +01:00
|
|
|
bl_label = "Clone from Paint Slot"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
2015-01-29 15:35:06 +11:00
|
|
|
|
2014-09-21 00:29:50 +02:00
|
|
|
class VIEW3D_MT_tools_projectpaint_uvlayer(Menu):
|
|
|
|
bl_label = "Clone Layer"
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
2017-05-25 15:11:00 +10:00
|
|
|
for i, uv_layer in enumerate(context.active_object.data.uv_layers):
|
|
|
|
props = layout.operator("wm.context_set_int", text=uv_layer.name, translate=False)
|
|
|
|
props.data_path = "active_object.data.uv_layers.active_index"
|
2014-09-21 00:29:50 +02:00
|
|
|
props.value = i
|
|
|
|
|
2014-07-21 12:02:05 +02:00
|
|
|
|
|
|
|
class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel):
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
2018-06-05 16:35:20 +02:00
|
|
|
bl_context = ".imagepaint" # dot on purpose (access from topbar)
|
2018-10-05 17:40:24 +02:00
|
|
|
bl_label = "Texture Slots"
|
2014-07-21 12:02:05 +02:00
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
brush = context.tool_settings.image_paint.brush
|
2019-12-19 18:12:10 +11:00
|
|
|
return (brush is not None and context.active_object is not None)
|
2014-07-21 12:02:05 +02:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
2018-10-05 17:40:24 +02:00
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
2014-07-21 12:02:05 +02:00
|
|
|
|
|
|
|
settings = context.tool_settings.image_paint
|
|
|
|
|
|
|
|
ob = context.active_object
|
|
|
|
|
2018-10-05 17:40:24 +02:00
|
|
|
layout.prop(settings, "mode", text="Mode")
|
|
|
|
layout.separator()
|
2014-07-21 12:02:05 +02:00
|
|
|
|
2014-08-28 16:40:38 +02:00
|
|
|
if settings.mode == 'MATERIAL':
|
|
|
|
if len(ob.material_slots) > 1:
|
2018-10-05 17:40:24 +02:00
|
|
|
layout.template_list("MATERIAL_UL_matslots", "layers",
|
|
|
|
ob, "material_slots",
|
|
|
|
ob, "active_material_index", rows=2)
|
2014-08-28 16:40:38 +02:00
|
|
|
mat = ob.active_material
|
2018-10-16 08:50:35 +11:00
|
|
|
if mat and mat.texture_paint_images:
|
2018-10-05 17:40:24 +02:00
|
|
|
row = layout.row()
|
|
|
|
row.template_list("TEXTURE_UL_texpaintslots", "",
|
2014-08-28 16:40:38 +02:00
|
|
|
mat, "texture_paint_images",
|
|
|
|
mat, "paint_active_slot", rows=2)
|
2014-07-21 12:02:05 +02:00
|
|
|
|
2015-01-28 14:42:47 +01:00
|
|
|
if mat.texture_paint_slots:
|
|
|
|
slot = mat.texture_paint_slots[mat.paint_active_slot]
|
2015-01-28 15:24:21 +01:00
|
|
|
else:
|
|
|
|
slot = None
|
2015-01-28 14:42:47 +01:00
|
|
|
|
2018-10-05 17:40:24 +02:00
|
|
|
have_image = slot is not None
|
|
|
|
else:
|
|
|
|
row = layout.row()
|
|
|
|
|
|
|
|
box = row.box()
|
|
|
|
box.label(text="No Textures")
|
|
|
|
have_image = False
|
|
|
|
|
|
|
|
sub = row.column(align=True)
|
2018-10-01 10:45:50 +02:00
|
|
|
sub.operator_menu_enum("paint.add_texture_paint_slot", "type", icon='ADD', text="")
|
2014-08-28 16:40:38 +02:00
|
|
|
|
|
|
|
elif settings.mode == 'IMAGE':
|
2014-09-21 00:29:50 +02:00
|
|
|
mesh = ob.data
|
2017-05-25 15:11:00 +10:00
|
|
|
uv_text = mesh.uv_layers.active.name if mesh.uv_layers.active else ""
|
2018-10-05 17:40:24 +02:00
|
|
|
layout.template_ID(settings, "canvas", new="image.new", open="image.open")
|
|
|
|
if settings.missing_uvs:
|
2018-10-01 10:45:50 +02:00
|
|
|
layout.operator("paint.add_simple_uvs", icon='ADD', text="Add UVs")
|
2018-09-20 19:53:16 +02:00
|
|
|
else:
|
2018-10-05 17:40:24 +02:00
|
|
|
layout.menu("VIEW3D_MT_tools_projectpaint_uvlayer", text=uv_text, translate=False)
|
|
|
|
have_image = settings.canvas is not None
|
2018-09-20 19:53:16 +02:00
|
|
|
|
2018-12-23 16:26:21 +01:00
|
|
|
layout.prop(settings, "interpolation", text="")
|
|
|
|
|
2018-10-05 17:40:24 +02:00
|
|
|
if settings.missing_uvs:
|
|
|
|
layout.separator()
|
|
|
|
split = layout.split()
|
|
|
|
split.label(text="UV Map Needed", icon='INFO')
|
2018-10-01 10:45:50 +02:00
|
|
|
split.operator("paint.add_simple_uvs", icon='ADD', text="Add Simple UVs")
|
2018-10-05 17:40:24 +02:00
|
|
|
elif have_image:
|
|
|
|
layout.separator()
|
2019-05-16 16:01:11 +02:00
|
|
|
layout.operator("image.save_all_modified", text="Save All Images", icon='FILE_TICK')
|
2013-11-20 03:38:18 +11:00
|
|
|
|
2018-09-21 07:31:29 +10:00
|
|
|
|
2020-01-23 11:45:48 +01:00
|
|
|
class VIEW3D_PT_mask(View3DPanel, Panel):
|
|
|
|
bl_category = "Tool"
|
|
|
|
bl_context = ".imagepaint" # dot on purpose (access from topbar)
|
|
|
|
bl_label = "Masking"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
# TODO, move to space_view3d.py
|
2014-07-24 12:41:39 +02:00
|
|
|
class VIEW3D_PT_stencil_projectpaint(View3DPanel, Panel):
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
2018-06-05 16:35:20 +02:00
|
|
|
bl_context = ".imagepaint" # dot on purpose (access from topbar)
|
2020-01-23 11:45:48 +01:00
|
|
|
bl_label = "Stencil Mask"
|
2018-10-05 17:40:24 +02:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2020-01-23 11:45:48 +01:00
|
|
|
bl_parent_id = "VIEW3D_PT_mask"
|
2019-09-13 00:20:59 +02:00
|
|
|
bl_ui_units_x = 14
|
2014-07-24 12:41:39 +02:00
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
brush = context.tool_settings.image_paint.brush
|
|
|
|
ob = context.active_object
|
|
|
|
return (brush is not None and ob is not None)
|
|
|
|
|
|
|
|
def draw_header(self, context):
|
|
|
|
ipaint = context.tool_settings.image_paint
|
|
|
|
self.layout.prop(ipaint, "use_stencil_layer", text="")
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
2018-06-10 16:29:55 +02:00
|
|
|
layout.use_property_split = True
|
2018-10-25 15:27:31 +02:00
|
|
|
layout.use_property_decorate = False
|
2014-07-24 12:41:39 +02:00
|
|
|
|
2018-12-17 17:20:24 +11:00
|
|
|
tool_settings = context.tool_settings
|
|
|
|
ipaint = tool_settings.image_paint
|
2014-07-24 12:41:39 +02:00
|
|
|
ob = context.active_object
|
|
|
|
mesh = ob.data
|
|
|
|
|
|
|
|
col = layout.column()
|
|
|
|
col.active = ipaint.use_stencil_layer
|
|
|
|
|
2019-09-13 00:20:59 +02:00
|
|
|
col.label(text="Stencil Image")
|
|
|
|
col.template_ID(ipaint, "stencil_image", new="image.new", open="image.open")
|
|
|
|
|
2017-07-13 19:28:20 +10:00
|
|
|
stencil_text = mesh.uv_layer_stencil.name if mesh.uv_layer_stencil else ""
|
2019-09-13 00:20:59 +02:00
|
|
|
|
|
|
|
col.separator()
|
|
|
|
|
|
|
|
split = col.split()
|
2018-06-10 16:29:55 +02:00
|
|
|
colsub = split.column()
|
|
|
|
colsub.alignment = 'RIGHT'
|
2018-08-28 12:34:51 +10:00
|
|
|
colsub.label(text="UV Layer")
|
2018-06-10 16:29:55 +02:00
|
|
|
split.column().menu("VIEW3D_MT_tools_projectpaint_stencil", text=stencil_text, translate=False)
|
2014-07-24 12:41:39 +02:00
|
|
|
|
2019-09-13 00:20:59 +02:00
|
|
|
col.separator()
|
2014-10-06 15:12:06 +02:00
|
|
|
|
2014-07-24 12:41:39 +02:00
|
|
|
row = col.row(align=True)
|
2018-06-10 16:29:55 +02:00
|
|
|
row.prop(ipaint, "stencil_color", text="Display Color")
|
2014-07-24 12:41:39 +02:00
|
|
|
row.prop(ipaint, "invert_stencil", text="", icon='IMAGE_ALPHA')
|
|
|
|
|
|
|
|
|
2018-06-10 15:40:02 +02:00
|
|
|
# TODO, move to space_view3d.py
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class VIEW3D_PT_tools_brush_display(Panel, View3DPaintBrushPanel, DisplayPanel):
|
|
|
|
bl_context = ".paint_common"
|
|
|
|
bl_parent_id = "VIEW3D_PT_tools_brush_settings"
|
|
|
|
bl_label = "Cursor"
|
2018-10-01 15:39:03 +02:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2013-04-22 20:46:18 +00:00
|
|
|
|
2010-01-03 08:37:18 +00:00
|
|
|
|
2018-06-10 15:40:02 +02:00
|
|
|
# TODO, move to space_view3d.py
|
2012-01-18 05:54:19 +00:00
|
|
|
class VIEW3D_PT_tools_brush_texture(Panel, View3DPaintPanel):
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_context = ".paint_common"
|
|
|
|
bl_parent_id = "VIEW3D_PT_tools_brush_settings"
|
2010-01-03 08:37:18 +00:00
|
|
|
bl_label = "Texture"
|
2010-08-26 01:05:37 +00:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2010-01-03 08:37:18 +00:00
|
|
|
|
2010-08-09 01:37:09 +00:00
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
settings = cls.paint_settings(context)
|
2012-10-08 08:28:05 +00:00
|
|
|
return (settings and settings.brush and
|
2013-03-14 03:42:17 +00:00
|
|
|
(context.sculpt_object or context.image_paint_object or context.vertex_paint_object))
|
2010-01-03 08:37:18 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
2011-07-11 05:50:49 +00:00
|
|
|
settings = self.paint_settings(context)
|
2010-01-03 08:37:18 +00:00
|
|
|
brush = settings.brush
|
2010-01-31 14:46:28 +00:00
|
|
|
|
2010-01-03 08:37:18 +00:00
|
|
|
col = layout.column()
|
2010-01-31 14:46:28 +00:00
|
|
|
|
2010-07-14 14:11:03 +00:00
|
|
|
col.template_ID_preview(brush, "texture", new="texture.new", rows=3, cols=8)
|
2010-01-31 14:46:28 +00:00
|
|
|
|
2013-01-16 12:57:35 +00:00
|
|
|
brush_texture_settings(col, brush, context.sculpt_object)
|
2011-10-31 01:50:04 +00:00
|
|
|
|
2010-01-31 14:46:28 +00:00
|
|
|
|
2018-06-10 15:40:02 +02:00
|
|
|
# TODO, move to space_view3d.py
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class VIEW3D_PT_tools_mask_texture(Panel, View3DPaintPanel, TextureMaskPanel):
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
2018-06-05 16:35:20 +02:00
|
|
|
bl_context = ".imagepaint" # dot on purpose (access from topbar)
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_parent_id = "VIEW3D_PT_tools_brush_settings"
|
2013-03-25 01:00:16 +00:00
|
|
|
bl_label = "Texture Mask"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
2014-10-06 15:12:06 +02:00
|
|
|
settings = cls.paint_settings(context)
|
2014-10-10 12:33:02 +02:00
|
|
|
return (settings and settings.brush and context.image_paint_object)
|
2013-03-25 01:00:16 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
|
|
|
brush = context.tool_settings.image_paint.brush
|
|
|
|
|
|
|
|
col = layout.column()
|
|
|
|
|
|
|
|
col.template_ID_preview(brush, "mask_texture", new="texture.new", rows=3, cols=8)
|
|
|
|
|
|
|
|
brush_mask_texture_settings(col, brush)
|
2013-06-27 03:05:19 +00:00
|
|
|
|
2013-03-25 01:00:16 +00:00
|
|
|
|
2018-06-10 15:40:02 +02:00
|
|
|
# TODO, move to space_view3d.py
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class VIEW3D_PT_tools_brush_stroke(Panel, View3DPaintPanel, StrokePanel):
|
2018-04-30 16:59:16 +02:00
|
|
|
bl_context = ".paint_common" # dot on purpose (access from topbar)
|
2009-10-31 19:31:45 +00:00
|
|
|
bl_label = "Stroke"
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_parent_id = "VIEW3D_PT_tools_brush_settings"
|
2010-08-26 01:05:37 +00:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class VIEW3D_PT_tools_brush_stroke_smooth_stroke(Panel, View3DPaintPanel, SmoothStrokePanel):
|
2018-10-31 17:23:43 +01:00
|
|
|
bl_context = ".paint_common" # dot on purpose (access from topbar)
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_label = "Stabilize Stroke"
|
2018-10-31 17:23:43 +01:00
|
|
|
bl_parent_id = "VIEW3D_PT_tools_brush_stroke"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
2013-04-07 01:38:03 +00:00
|
|
|
|
2018-06-10 15:40:02 +02:00
|
|
|
# TODO, move to space_view3d.py
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class VIEW3D_PT_tools_brush_falloff(Panel, View3DPaintPanel, FalloffPanel):
|
2018-04-30 16:59:16 +02:00
|
|
|
bl_context = ".paint_common" # dot on purpose (access from topbar)
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_parent_id = "VIEW3D_PT_tools_brush_settings"
|
2019-03-19 18:17:50 +01:00
|
|
|
bl_label = "Falloff"
|
2010-08-26 01:05:37 +00:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-08-09 08:18:49 +00:00
|
|
|
|
2019-03-19 18:17:50 +01:00
|
|
|
class VIEW3D_PT_tools_brush_falloff_frontface(View3DPaintPanel, Panel):
|
|
|
|
bl_context = ".imagepaint" # dot on purpose (access from topbar)
|
2020-02-17 13:00:01 +01:00
|
|
|
bl_label = "Front-face Falloff"
|
2019-03-19 18:17:50 +01:00
|
|
|
bl_parent_id = "VIEW3D_PT_tools_brush_falloff"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
return (context.weight_paint_object or context.vertex_paint_object)
|
|
|
|
|
|
|
|
def draw_header(self, context):
|
|
|
|
settings = self.paint_settings(context)
|
|
|
|
brush = settings.brush
|
|
|
|
|
|
|
|
self.layout.prop(brush, "use_frontface_falloff", text="")
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
settings = self.paint_settings(context)
|
|
|
|
brush = settings.brush
|
|
|
|
|
|
|
|
layout = self.layout
|
|
|
|
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
|
|
|
layout.active = brush.use_frontface_falloff
|
|
|
|
layout.prop(brush, "falloff_angle", text="Angle")
|
|
|
|
|
|
|
|
|
|
|
|
class VIEW3D_PT_tools_brush_falloff_normal(View3DPaintPanel, Panel):
|
|
|
|
bl_context = ".imagepaint" # dot on purpose (access from topbar)
|
|
|
|
bl_label = "Normal Falloff"
|
|
|
|
bl_parent_id = "VIEW3D_PT_tools_brush_falloff"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
return context.image_paint_object
|
|
|
|
|
|
|
|
def draw_header(self, context):
|
|
|
|
tool_settings = context.tool_settings
|
|
|
|
ipaint = tool_settings.image_paint
|
|
|
|
|
|
|
|
self.layout.prop(ipaint, "use_normal_falloff", text="")
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
tool_settings = context.tool_settings
|
|
|
|
ipaint = tool_settings.image_paint
|
|
|
|
|
|
|
|
layout = self.layout
|
|
|
|
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
|
|
|
layout.active = ipaint.use_normal_falloff
|
|
|
|
layout.prop(ipaint, "normal_angle", text="Angle")
|
|
|
|
|
|
|
|
|
2018-06-10 15:40:02 +02:00
|
|
|
# TODO, move to space_view3d.py
|
2014-03-24 23:17:01 +02:00
|
|
|
class VIEW3D_PT_sculpt_dyntopo(Panel, View3DPaintPanel):
|
2018-04-30 16:59:16 +02:00
|
|
|
bl_context = ".sculpt_mode" # dot on purpose (access from topbar)
|
2014-03-24 23:17:01 +02:00
|
|
|
bl_label = "Dyntopo"
|
2012-12-30 18:31:17 +00:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2018-07-13 17:58:22 +02:00
|
|
|
bl_ui_units_x = 12
|
2012-12-30 18:31:17 +00:00
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
return (context.sculpt_object and context.tool_settings.sculpt)
|
|
|
|
|
2016-07-01 21:40:59 +10:00
|
|
|
def draw_header(self, context):
|
2018-06-09 17:36:28 +02:00
|
|
|
is_popover = self.is_popover
|
2016-07-01 21:40:59 +10:00
|
|
|
layout = self.layout
|
|
|
|
layout.operator(
|
2018-06-05 16:32:11 +02:00
|
|
|
"sculpt.dynamic_topology_toggle",
|
|
|
|
icon='CHECKBOX_HLT' if context.sculpt_object.use_dynamic_topology_sculpting else 'CHECKBOX_DEHLT',
|
|
|
|
text="",
|
2018-06-09 17:36:28 +02:00
|
|
|
emboss=is_popover,
|
2018-06-05 16:32:11 +02:00
|
|
|
)
|
2016-07-01 21:40:59 +10:00
|
|
|
|
2012-12-30 18:31:17 +00:00
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
2018-06-10 15:55:19 +02:00
|
|
|
layout.use_property_split = True
|
2018-07-13 17:58:22 +02:00
|
|
|
layout.use_property_decorate = False
|
2012-12-30 18:31:17 +00:00
|
|
|
|
2018-12-17 17:20:24 +11:00
|
|
|
tool_settings = context.tool_settings
|
|
|
|
sculpt = tool_settings.sculpt
|
2013-11-19 21:55:46 +01:00
|
|
|
settings = self.paint_settings(context)
|
|
|
|
brush = settings.brush
|
2012-12-30 18:31:17 +00:00
|
|
|
|
|
|
|
col = layout.column()
|
|
|
|
col.active = context.sculpt_object.use_dynamic_topology_sculpting
|
2018-06-10 15:55:19 +02:00
|
|
|
|
|
|
|
sub = col.column()
|
2014-06-12 22:00:26 +10:00
|
|
|
sub.active = (brush and brush.sculpt_tool != 'MASK')
|
2018-07-02 18:35:50 +02:00
|
|
|
if sculpt.detail_type_method in {'CONSTANT', 'MANUAL'}:
|
2014-03-23 00:01:46 +02:00
|
|
|
row = sub.row(align=True)
|
2016-11-12 16:14:09 +01:00
|
|
|
row.prop(sculpt, "constant_detail_resolution")
|
2019-11-26 18:53:38 +01:00
|
|
|
props = row.operator("sculpt.sample_detail_size", text="", icon='EYEDROPPER')
|
|
|
|
props.mode = 'DYNTOPO'
|
2015-05-06 22:51:49 +02:00
|
|
|
elif (sculpt.detail_type_method == 'BRUSH'):
|
|
|
|
sub.prop(sculpt, "detail_percent")
|
2014-03-22 17:47:18 +02:00
|
|
|
else:
|
2014-03-31 20:01:28 +03:00
|
|
|
sub.prop(sculpt, "detail_size")
|
2018-06-10 15:55:19 +02:00
|
|
|
sub.prop(sculpt, "detail_refine_method", text="Refine Method")
|
|
|
|
sub.prop(sculpt, "detail_type_method", text="Detailing")
|
|
|
|
|
2020-02-02 20:14:33 +01:00
|
|
|
if sculpt.detail_type_method in {'CONSTANT', 'MANUAL'}:
|
|
|
|
col.operator("sculpt.detail_flood_fill")
|
|
|
|
|
2012-12-30 18:31:17 +00:00
|
|
|
col.prop(sculpt, "use_smooth_shading")
|
2018-06-10 15:55:19 +02:00
|
|
|
|
2018-10-31 17:23:43 +01:00
|
|
|
|
|
|
|
|
|
|
|
|
2012-12-30 18:31:17 +00:00
|
|
|
|
2019-09-10 06:11:52 +10:00
|
|
|
|
2019-08-14 18:37:46 +02:00
|
|
|
class VIEW3D_PT_sculpt_voxel_remesh(Panel, View3DPaintPanel):
|
|
|
|
bl_context = ".sculpt_mode" # dot on purpose (access from topbar)
|
|
|
|
bl_label = "Remesh"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
bl_ui_units_x = 12
|
2018-12-20 13:01:40 +11:00
|
|
|
|
2019-08-14 18:37:46 +02:00
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
return (context.sculpt_object and context.tool_settings.sculpt)
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
|
|
|
col = layout.column()
|
|
|
|
mesh = context.active_object.data
|
2019-11-26 18:53:38 +01:00
|
|
|
row = col.row(align=True)
|
|
|
|
row.prop(mesh, "remesh_voxel_size")
|
|
|
|
props = row.operator("sculpt.sample_detail_size", text="", icon='EYEDROPPER')
|
|
|
|
props.mode = 'VOXEL'
|
2019-09-27 17:41:05 +02:00
|
|
|
col.prop(mesh, "remesh_voxel_adaptivity")
|
2019-10-30 05:30:38 +11:00
|
|
|
col.prop(mesh, "use_remesh_fix_poles")
|
|
|
|
col.prop(mesh, "use_remesh_smooth_normals")
|
|
|
|
col.prop(mesh, "use_remesh_preserve_volume")
|
|
|
|
col.prop(mesh, "use_remesh_preserve_paint_mask")
|
2020-03-05 14:53:23 +01:00
|
|
|
col.prop(mesh, "use_remesh_preserve_sculpt_face_sets")
|
2019-08-14 18:37:46 +02:00
|
|
|
col.operator("object.voxel_remesh", text="Remesh")
|
|
|
|
|
2019-12-16 14:29:03 +11:00
|
|
|
|
2019-08-14 18:37:46 +02:00
|
|
|
# TODO, move to space_view3d.py
|
2012-01-18 05:54:19 +00:00
|
|
|
class VIEW3D_PT_sculpt_options(Panel, View3DPaintPanel):
|
2018-04-30 16:59:16 +02:00
|
|
|
bl_context = ".sculpt_mode" # dot on purpose (access from topbar)
|
2009-10-31 19:31:45 +00:00
|
|
|
bl_label = "Options"
|
2010-08-26 01:05:37 +00:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-08-09 01:37:09 +00:00
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
2009-12-23 15:51:39 +00:00
|
|
|
return (context.sculpt_object and context.tool_settings.sculpt)
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
2018-10-31 17:23:43 +01:00
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
2018-12-17 17:26:47 +11:00
|
|
|
tool_settings = context.tool_settings
|
|
|
|
sculpt = tool_settings.sculpt
|
2018-10-31 17:23:43 +01:00
|
|
|
|
|
|
|
flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False)
|
|
|
|
|
|
|
|
col = flow.column()
|
|
|
|
col.prop(sculpt, "use_threaded", text="Threaded Sculpt")
|
|
|
|
col = flow.column()
|
|
|
|
col.prop(sculpt, "show_low_resolution")
|
|
|
|
col = flow.column()
|
|
|
|
col.prop(sculpt, "use_deform_only")
|
|
|
|
|
2019-12-16 14:29:03 +11:00
|
|
|
|
2018-10-31 17:23:43 +01:00
|
|
|
class VIEW3D_PT_sculpt_options_gravity(Panel, View3DPaintPanel):
|
|
|
|
bl_context = ".sculpt_mode" # dot on purpose (access from topbar)
|
|
|
|
bl_parent_id = "VIEW3D_PT_sculpt_options"
|
|
|
|
bl_label = "Gravity"
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
return (context.sculpt_object and context.tool_settings.sculpt)
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
2014-04-01 08:30:24 +11:00
|
|
|
|
2018-12-17 17:20:24 +11:00
|
|
|
tool_settings = context.tool_settings
|
|
|
|
sculpt = tool_settings.sculpt
|
2013-12-12 19:01:11 +02:00
|
|
|
capabilities = sculpt.brush.sculpt_capabilities
|
|
|
|
|
2018-10-31 17:23:43 +01:00
|
|
|
col = layout.column()
|
2013-12-12 19:01:11 +02:00
|
|
|
col.active = capabilities.has_gravity
|
|
|
|
col.prop(sculpt, "gravity", slider=True, text="Factor")
|
|
|
|
col.prop(sculpt, "gravity_object")
|
2011-05-04 13:15:42 +00:00
|
|
|
|
2010-09-07 15:17:42 +00:00
|
|
|
|
2018-06-10 15:40:02 +02:00
|
|
|
# TODO, move to space_view3d.py
|
2012-01-18 05:54:19 +00:00
|
|
|
class VIEW3D_PT_sculpt_symmetry(Panel, View3DPaintPanel):
|
2018-04-30 16:59:16 +02:00
|
|
|
bl_context = ".sculpt_mode" # dot on purpose (access from topbar)
|
2019-03-20 14:09:55 +01:00
|
|
|
bl_label = "Symmetry"
|
2010-08-26 01:05:37 +00:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2010-07-14 14:11:03 +00:00
|
|
|
|
2010-08-09 01:37:09 +00:00
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
2019-05-21 15:49:36 +10:00
|
|
|
return (
|
|
|
|
(context.sculpt_object and context.tool_settings.sculpt) and
|
|
|
|
# When used in the tool header, this is explicitly included next to the XYZ symmetry buttons.
|
|
|
|
(context.region.type != 'TOOL_HEADER')
|
|
|
|
)
|
2010-07-14 14:11:03 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
|
|
|
sculpt = context.tool_settings.sculpt
|
|
|
|
|
2018-06-10 15:55:19 +02:00
|
|
|
split = layout.split()
|
|
|
|
|
|
|
|
col = split.column()
|
|
|
|
col.alignment = 'RIGHT'
|
|
|
|
col.label(text="Mirror")
|
|
|
|
|
|
|
|
col = split.column()
|
|
|
|
|
2013-08-23 20:41:21 +00:00
|
|
|
row = col.row(align=True)
|
2011-10-31 00:03:18 +00:00
|
|
|
row.prop(sculpt, "use_symmetry_x", text="X", toggle=True)
|
|
|
|
row.prop(sculpt, "use_symmetry_y", text="Y", toggle=True)
|
|
|
|
row.prop(sculpt, "use_symmetry_z", text="Z", toggle=True)
|
2011-10-31 01:50:04 +00:00
|
|
|
|
2018-06-10 15:55:19 +02:00
|
|
|
split = layout.split()
|
2010-07-14 14:11:03 +00:00
|
|
|
|
2018-06-10 15:55:19 +02:00
|
|
|
col = split.column()
|
|
|
|
col.alignment = 'RIGHT'
|
|
|
|
col.label(text="Lock")
|
2014-02-13 08:51:33 +11:00
|
|
|
|
2018-06-10 15:55:19 +02:00
|
|
|
col = split.column()
|
|
|
|
|
|
|
|
row = col.row(align=True)
|
2014-02-12 17:04:39 +02:00
|
|
|
row.prop(sculpt, "lock_x", text="X", toggle=True)
|
|
|
|
row.prop(sculpt, "lock_y", text="Y", toggle=True)
|
|
|
|
row.prop(sculpt, "lock_z", text="Z", toggle=True)
|
2010-09-07 15:17:42 +00:00
|
|
|
|
2018-06-10 15:55:19 +02:00
|
|
|
split = layout.split()
|
|
|
|
|
|
|
|
col = split.column()
|
|
|
|
col.alignment = 'RIGHT'
|
|
|
|
col.label(text="Tiling")
|
|
|
|
|
|
|
|
col = split.column()
|
|
|
|
|
|
|
|
row = col.row(align=True)
|
2015-07-23 22:52:03 +02:00
|
|
|
row.prop(sculpt, "tile_x", text="X", toggle=True)
|
|
|
|
row.prop(sculpt, "tile_y", text="Y", toggle=True)
|
|
|
|
row.prop(sculpt, "tile_z", text="Z", toggle=True)
|
|
|
|
|
2018-06-10 15:55:19 +02:00
|
|
|
layout.use_property_split = True
|
2018-10-25 15:27:31 +02:00
|
|
|
layout.use_property_decorate = False
|
2018-06-10 15:55:19 +02:00
|
|
|
|
|
|
|
layout.prop(sculpt, "use_symmetry_feather", text="Feather")
|
|
|
|
layout.column().prop(sculpt, "radial_symmetry", text="Radial")
|
2015-07-23 22:52:03 +02:00
|
|
|
layout.column().prop(sculpt, "tile_offset", text="Tile Offset")
|
|
|
|
|
2020-02-02 20:14:33 +01:00
|
|
|
layout.separator()
|
|
|
|
|
|
|
|
col = layout.column()
|
|
|
|
|
|
|
|
col.prop(sculpt, "symmetrize_direction")
|
|
|
|
col.operator("sculpt.symmetrize")
|
|
|
|
|
2015-09-01 03:51:50 +10:00
|
|
|
|
2019-05-21 15:49:36 +10:00
|
|
|
class VIEW3D_PT_sculpt_symmetry_for_topbar(Panel):
|
|
|
|
bl_space_type = 'TOPBAR'
|
|
|
|
bl_region_type = 'HEADER'
|
|
|
|
bl_label = "Symmetry"
|
|
|
|
|
|
|
|
draw = VIEW3D_PT_sculpt_symmetry.draw
|
|
|
|
|
|
|
|
|
2011-10-17 06:58:07 +00:00
|
|
|
# ********** default tools for weight-paint ****************
|
2009-07-02 11:24:27 +00:00
|
|
|
|
2009-10-31 23:35:56 +00:00
|
|
|
|
2019-12-12 07:19:59 +01:00
|
|
|
# TODO, move to space_view3d.py
|
|
|
|
class VIEW3D_PT_tools_weightpaint_symmetry(Panel, View3DPaintPanel):
|
|
|
|
bl_context = ".weightpaint"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
bl_label = "Symmetry"
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
# When used in the tool header, this is explicitly included next to the XYZ symmetry buttons.
|
|
|
|
return (context.region.type != 'TOOL_HEADER')
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
tool_settings = context.tool_settings
|
|
|
|
wpaint = tool_settings.weight_paint
|
|
|
|
draw_vpaint_symmetry(layout, wpaint)
|
|
|
|
|
|
|
|
|
|
|
|
class VIEW3D_PT_tools_weightpaint_symmetry_for_topbar(Panel):
|
|
|
|
bl_space_type = 'TOPBAR'
|
|
|
|
bl_region_type = 'HEADER'
|
|
|
|
bl_label = "Symmetry"
|
|
|
|
|
|
|
|
draw = VIEW3D_PT_tools_weightpaint_symmetry.draw
|
|
|
|
|
|
|
|
|
2018-06-10 15:40:02 +02:00
|
|
|
# TODO, move to space_view3d.py
|
2012-01-18 05:54:19 +00:00
|
|
|
class VIEW3D_PT_tools_weightpaint_options(Panel, View3DPaintPanel):
|
2018-04-30 16:06:51 +02:00
|
|
|
bl_context = ".weightpaint"
|
2009-10-31 19:31:45 +00:00
|
|
|
bl_label = "Options"
|
2019-03-19 18:17:50 +01:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
2019-03-20 14:09:55 +01:00
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
2010-07-22 18:56:46 +00:00
|
|
|
tool_settings = context.tool_settings
|
|
|
|
wpaint = tool_settings.weight_paint
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
col = layout.column()
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
|
|
|
col.prop(tool_settings, "use_auto_normalize", text="Auto Normalize")
|
2018-10-07 18:25:51 +03:00
|
|
|
col.prop(tool_settings, "use_lock_relative", text="Lock-Relative")
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
col.prop(tool_settings, "use_multipaint", text="Multi-Paint")
|
|
|
|
|
2017-10-06 20:11:17 +11:00
|
|
|
col.prop(wpaint, "use_group_restrict")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-01-10 10:20:44 +00:00
|
|
|
obj = context.weight_paint_object
|
|
|
|
if obj.type == 'MESH':
|
2010-02-17 19:50:42 +00:00
|
|
|
mesh = obj.data
|
|
|
|
col.prop(mesh, "use_mirror_x")
|
2013-06-28 17:13:09 +00:00
|
|
|
row = col.row()
|
|
|
|
row.active = mesh.use_mirror_x
|
|
|
|
row.prop(mesh, "use_mirror_topology")
|
2009-07-24 11:14:59 +00:00
|
|
|
|
2019-03-20 14:09:55 +01:00
|
|
|
|
2011-10-17 06:58:07 +00:00
|
|
|
# ********** default tools for vertex-paint ****************
|
2009-07-02 11:24:27 +00:00
|
|
|
|
2009-10-31 23:35:56 +00:00
|
|
|
|
2018-06-10 15:40:02 +02:00
|
|
|
# TODO, move to space_view3d.py
|
2019-03-20 14:09:55 +01:00
|
|
|
class VIEW3D_PT_tools_vertexpaint_options(Panel, View3DPaintPanel):
|
2018-04-30 15:21:04 +02:00
|
|
|
bl_context = ".vertexpaint" # dot on purpose (access from topbar)
|
2009-10-31 19:31:45 +00:00
|
|
|
bl_label = "Options"
|
2019-03-19 18:17:50 +01:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2009-10-31 19:31:45 +00:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
@classmethod
|
2019-12-16 14:29:03 +11:00
|
|
|
def poll(self, _context):
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
# This is currently unused, since there aren't any Vertex Paint mode specific options.
|
|
|
|
return False
|
|
|
|
|
2019-12-16 14:29:03 +11:00
|
|
|
def draw(self, _context):
|
2009-10-31 19:31:45 +00:00
|
|
|
layout = self.layout
|
2019-03-20 14:09:55 +01:00
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
2017-09-28 01:38:17 +10:00
|
|
|
|
2018-06-10 15:40:02 +02:00
|
|
|
# TODO, move to space_view3d.py
|
2017-09-28 01:38:17 +10:00
|
|
|
class VIEW3D_PT_tools_vertexpaint_symmetry(Panel, View3DPaintPanel):
|
2018-04-30 15:21:04 +02:00
|
|
|
bl_context = ".vertexpaint" # dot on purpose (access from topbar)
|
2017-09-28 01:38:17 +10:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
bl_label = "Symmetry"
|
|
|
|
|
2019-05-21 15:49:36 +10:00
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
# When used in the tool header, this is explicitly included next to the XYZ symmetry buttons.
|
|
|
|
return (context.region.type != 'TOOL_HEADER')
|
|
|
|
|
2017-09-28 01:38:17 +10:00
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
2018-12-17 17:20:24 +11:00
|
|
|
tool_settings = context.tool_settings
|
|
|
|
vpaint = tool_settings.vertex_paint
|
2017-09-28 01:38:17 +10:00
|
|
|
draw_vpaint_symmetry(layout, vpaint)
|
|
|
|
|
|
|
|
|
2019-05-21 15:49:36 +10:00
|
|
|
class VIEW3D_PT_tools_vertexpaint_symmetry_for_topbar(Panel):
|
|
|
|
bl_space_type = 'TOPBAR'
|
|
|
|
bl_region_type = 'HEADER'
|
|
|
|
bl_label = "Symmetry"
|
|
|
|
|
|
|
|
draw = VIEW3D_PT_tools_vertexpaint_symmetry.draw
|
|
|
|
|
|
|
|
|
2011-10-17 06:58:07 +00:00
|
|
|
# ********** default tools for texture-paint ****************
|
2009-07-02 11:24:27 +00:00
|
|
|
|
2009-10-31 23:35:56 +00:00
|
|
|
|
2018-06-10 15:40:02 +02:00
|
|
|
# TODO, move to space_view3d.py
|
2019-03-20 14:09:55 +01:00
|
|
|
class VIEW3D_PT_tools_imagepaint_options_external(Panel, View3DPaintPanel):
|
2018-06-05 16:35:20 +02:00
|
|
|
bl_context = ".imagepaint" # dot on purpose (access from topbar)
|
2014-06-03 12:05:47 +10:00
|
|
|
bl_label = "External"
|
2019-03-20 14:09:55 +01:00
|
|
|
bl_parent_id = "VIEW3D_PT_tools_imagepaint_options"
|
2014-06-03 12:05:47 +10:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
2018-10-31 17:23:43 +01:00
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
2014-06-03 12:05:47 +10:00
|
|
|
|
2018-12-17 17:20:24 +11:00
|
|
|
tool_settings = context.tool_settings
|
|
|
|
ipaint = tool_settings.image_paint
|
2014-06-03 12:05:47 +10:00
|
|
|
|
2018-10-31 17:23:43 +01:00
|
|
|
layout.prop(ipaint, "screen_grab_size", text="Screen Grab Size")
|
2014-06-03 12:05:47 +10:00
|
|
|
|
2018-10-31 17:23:43 +01:00
|
|
|
layout.separator()
|
2014-06-03 12:05:47 +10:00
|
|
|
|
2018-10-31 17:23:43 +01:00
|
|
|
flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False)
|
|
|
|
col = flow.column()
|
|
|
|
col.operator("image.project_edit", text="Quick Edit")
|
|
|
|
col = flow.column()
|
|
|
|
col.operator("image.project_apply", text="Apply")
|
|
|
|
col = flow.column()
|
2014-06-03 12:05:47 +10:00
|
|
|
col.operator("paint.project_image", text="Apply Camera Image")
|
|
|
|
|
|
|
|
|
2018-06-10 15:40:02 +02:00
|
|
|
# TODO, move to space_view3d.py
|
2015-04-28 23:34:40 +10:00
|
|
|
class VIEW3D_PT_tools_imagepaint_symmetry(Panel, View3DPaintPanel):
|
2018-06-05 16:35:20 +02:00
|
|
|
bl_context = ".imagepaint" # dot on purpose (access from topbar)
|
2015-04-28 23:34:40 +10:00
|
|
|
bl_label = "Symmetry"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
2019-05-21 15:49:36 +10:00
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
# When used in the tool header, this is explicitly included next to the XYZ symmetry buttons.
|
|
|
|
return (context.region.type != 'TOOL_HEADER')
|
|
|
|
|
2015-04-28 23:34:40 +10:00
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
2018-12-17 17:20:24 +11:00
|
|
|
tool_settings = context.tool_settings
|
|
|
|
ipaint = tool_settings.image_paint
|
2015-04-28 23:34:40 +10:00
|
|
|
|
2018-06-10 15:55:19 +02:00
|
|
|
split = layout.split()
|
|
|
|
|
|
|
|
col = split.column()
|
|
|
|
col.alignment = 'RIGHT'
|
|
|
|
col.label(text="Mirror")
|
|
|
|
|
|
|
|
col = split.column()
|
|
|
|
|
2015-04-28 23:34:40 +10:00
|
|
|
row = col.row(align=True)
|
|
|
|
row.prop(ipaint, "use_symmetry_x", text="X", toggle=True)
|
|
|
|
row.prop(ipaint, "use_symmetry_y", text="Y", toggle=True)
|
|
|
|
row.prop(ipaint, "use_symmetry_z", text="Z", toggle=True)
|
|
|
|
|
|
|
|
|
2018-06-10 15:40:02 +02:00
|
|
|
# TODO, move to space_view3d.py
|
2019-03-20 14:09:55 +01:00
|
|
|
class VIEW3D_PT_tools_imagepaint_options(View3DPaintPanel, Panel):
|
2018-06-05 16:35:20 +02:00
|
|
|
bl_context = ".imagepaint" # dot on purpose (access from topbar)
|
2019-03-20 14:09:55 +01:00
|
|
|
bl_label = "Options"
|
2018-10-01 15:39:03 +02:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-08-09 01:37:09 +00:00
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
2010-08-04 12:18:07 +00:00
|
|
|
brush = context.tool_settings.image_paint.brush
|
2012-11-06 09:19:51 +00:00
|
|
|
return (brush is not None)
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
2018-10-31 17:23:43 +01:00
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
2018-12-17 17:20:24 +11:00
|
|
|
tool_settings = context.tool_settings
|
|
|
|
ipaint = tool_settings.image_paint
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2011-11-02 16:19:57 +00:00
|
|
|
layout.prop(ipaint, "seam_bleed")
|
2019-03-12 11:07:43 +01:00
|
|
|
layout.prop(ipaint, "dither", slider=True)
|
2018-10-31 17:23:43 +01:00
|
|
|
|
|
|
|
flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False)
|
|
|
|
|
|
|
|
col = flow.column()
|
|
|
|
col.prop(ipaint, "use_occlude")
|
|
|
|
|
|
|
|
col = flow.column()
|
2019-03-12 11:07:43 +01:00
|
|
|
col.prop(ipaint, "use_backface_culling", text="Backface Culling")
|
|
|
|
|
|
|
|
|
2019-03-20 14:09:55 +01:00
|
|
|
class VIEW3D_PT_tools_imagepaint_options_cavity(View3DPaintPanel, Panel):
|
2018-10-31 17:23:43 +01:00
|
|
|
bl_context = ".imagepaint" # dot on purpose (access from topbar)
|
|
|
|
bl_label = "Cavity Mask"
|
2020-01-23 11:45:48 +01:00
|
|
|
bl_parent_id = "VIEW3D_PT_mask"
|
2018-10-31 17:23:43 +01:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
def draw_header(self, context):
|
2018-12-17 17:26:47 +11:00
|
|
|
tool_settings = context.tool_settings
|
|
|
|
ipaint = tool_settings.image_paint
|
2018-10-31 17:23:43 +01:00
|
|
|
|
|
|
|
self.layout.prop(ipaint, "use_cavity", text="")
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
2018-12-17 17:26:47 +11:00
|
|
|
tool_settings = context.tool_settings
|
|
|
|
ipaint = tool_settings.image_paint
|
2018-10-31 17:23:43 +01:00
|
|
|
|
|
|
|
layout.active = ipaint.use_cavity
|
|
|
|
|
2019-05-06 13:03:23 +02:00
|
|
|
layout.template_curve_mapping(ipaint, "cavity_curve", brush=True,
|
|
|
|
use_negative_slope=True)
|
2018-10-31 17:23:43 +01:00
|
|
|
|
2009-12-22 10:48:13 +00:00
|
|
|
|
2018-06-10 15:40:02 +02:00
|
|
|
# TODO, move to space_view3d.py
|
2012-01-18 05:54:19 +00:00
|
|
|
class VIEW3D_PT_imagepaint_options(View3DPaintPanel):
|
2010-07-22 18:56:46 +00:00
|
|
|
bl_label = "Options"
|
|
|
|
|
2010-08-09 01:37:09 +00:00
|
|
|
@classmethod
|
2019-12-16 14:29:03 +11:00
|
|
|
def poll(cls, _context):
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
# This is currently unused, since there aren't any Vertex Paint mode specific options.
|
2019-12-16 13:43:45 +11:00
|
|
|
return False
|
2019-12-16 14:29:03 +11:00
|
|
|
# return (context.image_paint_object and context.tool_settings.image_paint)
|
2010-07-22 18:56:46 +00:00
|
|
|
|
2019-12-16 14:29:03 +11:00
|
|
|
def draw(self, _context):
|
2010-07-22 18:56:46 +00:00
|
|
|
layout = self.layout
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
2010-09-07 15:17:42 +00:00
|
|
|
|
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class VIEW3D_MT_tools_projectpaint_stencil(Menu):
|
2010-02-14 11:21:21 +00:00
|
|
|
bl_label = "Mask Layer"
|
2009-12-22 10:48:13 +00:00
|
|
|
|
2010-02-14 11:21:21 +00:00
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
2017-05-25 15:11:00 +10:00
|
|
|
for i, uv_layer in enumerate(context.active_object.data.uv_layers):
|
|
|
|
props = layout.operator("wm.context_set_int", text=uv_layer.name, translate=False)
|
2017-07-13 19:28:20 +10:00
|
|
|
props.data_path = "active_object.data.uv_layer_stencil_index"
|
2012-01-01 13:09:58 +00:00
|
|
|
props.value = i
|
2009-12-22 10:48:13 +00:00
|
|
|
|
2009-07-25 22:31:02 +00:00
|
|
|
|
2018-06-10 15:40:02 +02:00
|
|
|
# TODO, move to space_view3d.py
|
2019-03-18 21:30:56 +01:00
|
|
|
class VIEW3D_PT_tools_particlemode_options(View3DPanel, Panel):
|
2013-03-10 17:42:08 +00:00
|
|
|
"""Default tools for particle mode"""
|
2019-05-16 22:13:28 +10:00
|
|
|
bl_category = "Tool"
|
2018-05-07 15:01:37 +02:00
|
|
|
bl_context = ".particlemode"
|
2009-10-31 19:31:45 +00:00
|
|
|
bl_label = "Options"
|
2019-03-18 21:30:56 +01:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
2019-03-18 21:30:56 +01:00
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False # No animation.
|
|
|
|
|
2009-10-31 19:31:45 +00:00
|
|
|
pe = context.tool_settings.particle_edit
|
|
|
|
ob = pe.object
|
|
|
|
|
2019-03-18 21:30:56 +01:00
|
|
|
layout.prop(pe, "type", text="Editing Type")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2009-11-06 12:27:28 +00:00
|
|
|
ptcache = None
|
|
|
|
|
2009-10-31 19:31:45 +00:00
|
|
|
if pe.type == 'PARTICLES':
|
|
|
|
if ob.particle_systems:
|
|
|
|
if len(ob.particle_systems) > 1:
|
2013-02-18 13:30:40 +00:00
|
|
|
layout.template_list("UI_UL_list", "particle_systems", ob, "particle_systems",
|
This commit frees list ui items from their dependencies to Panel, and hence from all the limitations this implied (mostly, the "only one list per panel" one).
It introduces a new (py-extendable and registrable) RNA type, UIList (roughly similar to Panel one), which currently contains only "standard" list's scroll pos and size (but may be expended to include e.g. some filtering data, etc.). This now makes lists completely independent from Panels!
This UIList has a draw_item callback which allows to customize items' drawing from python, that all addons can now use. Incidentally, this also greatly simplifies the C code of this widget, as we do not code any "special case" here anymore!
To make all this work, other changes were also necessary:
* Now all buttons (uiBut struct) have a 'custom_data' void pointer, used currently to store the uiList struct associated with a given uiLayoutListBox.
* DynamicPaintSurface now exposes a new bool, use_color_preview (readonly), saying whether that surface has some 3D view preview data or not.
* UILayout class has now four new (static) functions, to get the actual icon of any RNA object (important e.g. with materials or textures), and to get an enum item's UI name, description and icon.
* UILayout's label() func now takes an optional 'icon_value' integer parameter, which if not zero will override the 'icon' one (mandatory to use "custom" icons as generated for material/texture/... previews).
Note: not sure whether we should add that one to all UILayout's prop funcs?
Note: will update addons using template list asap.
2012-12-28 09:20:16 +00:00
|
|
|
ob.particle_systems, "active_index", rows=2, maxrows=3)
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-08-24 04:02:50 +00:00
|
|
|
ptcache = ob.particle_systems.active.point_cache
|
2009-10-31 19:31:45 +00:00
|
|
|
else:
|
|
|
|
for md in ob.modifiers:
|
2009-10-31 23:35:56 +00:00
|
|
|
if md.type == pe.type:
|
2009-10-31 19:31:45 +00:00
|
|
|
ptcache = md.point_cache
|
|
|
|
|
2010-08-18 08:26:18 +00:00
|
|
|
if ptcache and len(ptcache.point_caches) > 1:
|
2013-02-18 13:30:40 +00:00
|
|
|
layout.template_list("UI_UL_list", "particles_point_caches", ptcache, "point_caches",
|
|
|
|
ptcache.point_caches, "active_index", rows=2, maxrows=3)
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-08-18 08:26:18 +00:00
|
|
|
if not pe.is_editable:
|
2009-11-23 00:27:30 +00:00
|
|
|
layout.label(text="Point cache must be baked")
|
2010-12-21 20:25:37 +00:00
|
|
|
layout.label(text="in memory to enable editing!")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
col = layout.column(align=True)
|
2010-08-18 08:26:18 +00:00
|
|
|
col.active = pe.is_editable
|
2010-01-05 15:23:09 +00:00
|
|
|
col.prop(ob.data, "use_mirror_x")
|
2019-12-16 12:25:42 +01:00
|
|
|
if pe.tool == 'ADD':
|
|
|
|
col.prop(ob.data, "use_mirror_topology")
|
2019-03-18 21:30:56 +01:00
|
|
|
col.separator()
|
|
|
|
col.prop(pe, "use_preserve_length", text="Preserve Strand Lengths")
|
|
|
|
col.prop(pe, "use_preserve_root", text="Preserve Root Positions")
|
|
|
|
if not pe.is_hair:
|
|
|
|
col.prop(pe, "use_auto_velocity", text="Auto-Velocity")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2019-03-20 10:26:53 +11:00
|
|
|
|
2019-03-18 21:30:56 +01:00
|
|
|
class VIEW3D_PT_tools_particlemode_options_shapecut(View3DPanel, Panel):
|
|
|
|
"""Default tools for particle mode"""
|
2019-05-16 22:13:28 +10:00
|
|
|
bl_category = "Tool"
|
2019-03-18 21:30:56 +01:00
|
|
|
bl_parent_id = "VIEW3D_PT_tools_particlemode_options"
|
|
|
|
bl_label = "Cut Particles to Shape"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2014-10-22 16:36:23 +02:00
|
|
|
|
2019-03-18 21:30:56 +01:00
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False # No animation.
|
|
|
|
|
|
|
|
pe = context.tool_settings.particle_edit
|
|
|
|
|
|
|
|
layout.prop(pe, "shape_object")
|
|
|
|
layout.operator("particle.shape_cut", text="Cut")
|
|
|
|
|
2019-03-20 10:26:53 +11:00
|
|
|
|
2019-03-18 21:30:56 +01:00
|
|
|
class VIEW3D_PT_tools_particlemode_options_display(View3DPanel, Panel):
|
|
|
|
"""Default tools for particle mode"""
|
2019-05-16 22:13:28 +10:00
|
|
|
bl_category = "Tool"
|
2019-03-18 21:30:56 +01:00
|
|
|
bl_parent_id = "VIEW3D_PT_tools_particlemode_options"
|
|
|
|
bl_label = "Viewport Display"
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False # No animation.
|
|
|
|
|
|
|
|
pe = context.tool_settings.particle_edit
|
|
|
|
|
|
|
|
col = layout.column()
|
2010-08-18 08:26:18 +00:00
|
|
|
col.active = pe.is_editable
|
2018-09-03 18:58:41 +02:00
|
|
|
col.prop(pe, "display_step", text="Path Steps")
|
2010-08-18 08:26:18 +00:00
|
|
|
if pe.is_hair:
|
2010-08-17 17:03:52 +00:00
|
|
|
col.prop(pe, "show_particles", text="Children")
|
2010-03-22 19:38:40 +00:00
|
|
|
else:
|
|
|
|
if pe.type == 'PARTICLES':
|
2010-08-17 17:03:52 +00:00
|
|
|
col.prop(pe, "show_particles", text="Particles")
|
2010-08-20 06:09:58 +00:00
|
|
|
col.prop(pe, "use_fade_time")
|
2013-08-23 20:41:21 +00:00
|
|
|
sub = col.row(align=True)
|
2010-08-20 06:09:58 +00:00
|
|
|
sub.active = pe.use_fade_time
|
2010-03-22 19:38:40 +00:00
|
|
|
sub.prop(pe, "fade_frames", slider=True)
|
2011-04-04 10:13:04 +00:00
|
|
|
|
2014-02-13 08:51:33 +11:00
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
# ********** grease pencil object tool panels ****************
|
|
|
|
|
|
|
|
# Grease Pencil drawing brushes
|
2018-12-20 13:01:40 +11:00
|
|
|
|
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
class GreasePencilPaintPanel:
|
2018-07-31 10:22:19 +02:00
|
|
|
bl_context = ".greasepencil_paint"
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
2019-12-16 13:43:45 +11:00
|
|
|
if context.space_data.type in {'VIEW_3D', 'PROPERTIES'}:
|
2018-07-31 10:22:19 +02:00
|
|
|
if context.gpencil_data is None:
|
|
|
|
return False
|
|
|
|
|
|
|
|
gpd = context.gpencil_data
|
|
|
|
return bool(gpd.is_stroke_paint_mode)
|
|
|
|
else:
|
|
|
|
return True
|
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
class VIEW3D_PT_tools_grease_pencil_brush_select(Panel, View3DPanel, GreasePencilPaintPanel):
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_label = "Brushes"
|
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
2018-12-17 17:17:43 +11:00
|
|
|
tool_settings = context.scene.tool_settings
|
|
|
|
gpencil_paint = tool_settings.gpencil_paint
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
row = layout.row()
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
row.column().template_ID_preview(gpencil_paint, "brush", new="brush.add_gpencil", rows=3, cols=8)
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
col = row.column()
|
2020-03-09 16:27:24 +01:00
|
|
|
col.menu("VIEW3D_MT_brush_gpencil_context_menu", icon='DOWNARROW_HLT', text="")
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
|
|
|
if context.mode == 'PAINT_GPENCIL':
|
|
|
|
brush = tool_settings.gpencil_paint.brush
|
2019-12-19 18:12:10 +11:00
|
|
|
if brush is not None:
|
|
|
|
gp_settings = brush.gpencil_settings
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
2019-12-19 18:12:10 +11:00
|
|
|
col.prop(brush, "use_custom_icon", toggle=True, icon='FILE_IMAGE', text="")
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
2019-12-19 18:12:10 +11:00
|
|
|
if brush.use_custom_icon:
|
|
|
|
layout.row().prop(brush, "icon_filepath", text="")
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
class VIEW3D_PT_tools_grease_pencil_brush_settings(Panel, View3DPanel, GreasePencilPaintPanel):
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_label = "Brush Settings"
|
2018-07-31 10:22:19 +02:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
# What is the point of brush presets? Seems to serve the exact same purpose as brushes themselves??
|
|
|
|
def draw_header_preset(self, _context):
|
|
|
|
VIEW3D_PT_gpencil_brush_presets.draw_panel_header(self.layout)
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
|
|
|
tool_settings = context.scene.tool_settings
|
|
|
|
gpencil_paint = tool_settings.gpencil_paint
|
|
|
|
|
|
|
|
brush = gpencil_paint.brush
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
if brush is not None:
|
2018-12-15 09:54:31 +01:00
|
|
|
gp_settings = brush.gpencil_settings
|
|
|
|
|
2019-02-03 13:27:25 +01:00
|
|
|
if brush.gpencil_tool in {'DRAW', 'FILL'}:
|
2019-03-25 17:02:42 +01:00
|
|
|
row = layout.row(align=True)
|
|
|
|
row_mat = row.row()
|
|
|
|
if gp_settings.use_material_pin:
|
|
|
|
row_mat.template_ID(gp_settings, "material", live_icon=True)
|
|
|
|
else:
|
|
|
|
row_mat.template_ID(context.active_object, "active_material", live_icon=True)
|
|
|
|
row_mat.enabled = False # will otherwise allow to change material in active slot
|
|
|
|
|
|
|
|
row.prop(gp_settings, "use_material_pin", text="")
|
2018-07-31 10:22:19 +02:00
|
|
|
|
2019-01-02 14:36:56 +11:00
|
|
|
if not self.is_popover:
|
2019-06-11 16:08:32 +10:00
|
|
|
from bl_ui.properties_paint_common import (
|
2019-01-02 14:36:56 +11:00
|
|
|
brush_basic_gpencil_paint_settings,
|
|
|
|
)
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
brush_basic_gpencil_paint_settings(layout, context, brush, compact=False)
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class VIEW3D_PT_tools_grease_pencil_brush_advanced(View3DPanel, Panel):
|
2018-07-31 10:22:19 +02:00
|
|
|
bl_context = ".greasepencil_paint"
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_label = "Advanced"
|
|
|
|
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_settings'
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2018-07-31 10:22:19 +02:00
|
|
|
|
2018-09-12 15:18:05 +02:00
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
2018-12-17 17:17:43 +11:00
|
|
|
brush = context.tool_settings.gpencil_paint.brush
|
2020-03-09 16:27:24 +01:00
|
|
|
return brush is not None and brush.gpencil_tool not in {'ERASE', 'TINT'}
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
tool_settings = context.scene.tool_settings
|
|
|
|
gpencil_paint = tool_settings.gpencil_paint
|
|
|
|
brush = gpencil_paint.brush
|
|
|
|
gp_settings = brush.gpencil_settings
|
2018-07-31 10:22:19 +02:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
col = layout.column(align=True)
|
2018-07-31 10:22:19 +02:00
|
|
|
if brush is not None:
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
if brush.gpencil_tool != 'FILL':
|
|
|
|
col.prop(gp_settings, "input_samples")
|
|
|
|
col.separator()
|
2018-07-31 10:22:19 +02:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
col.prop(gp_settings, "active_smooth_factor")
|
|
|
|
col.separator()
|
2018-07-31 10:22:19 +02:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
col.prop(gp_settings, "angle", slider=True)
|
|
|
|
col.prop(gp_settings, "angle_factor", text="Factor", slider=True)
|
2019-04-15 10:32:06 +02:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
ob = context.object
|
2019-04-18 16:57:41 +02:00
|
|
|
ma = None
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
if ob and brush.gpencil_settings.use_material_pin is False:
|
|
|
|
ma = ob.active_material
|
|
|
|
elif brush.gpencil_settings.material:
|
|
|
|
ma = brush.gpencil_settings.material
|
2019-04-15 10:32:06 +02:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
col.separator()
|
2020-04-02 16:27:14 +02:00
|
|
|
col.prop(gp_settings, "hardness", slider=True)
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
subcol = col.column(align=True)
|
|
|
|
if ma and ma.grease_pencil.mode == 'LINE':
|
|
|
|
subcol.enabled = False
|
2020-03-09 16:27:24 +01:00
|
|
|
subcol.prop(gp_settings, "aspect")
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
|
|
|
elif brush.gpencil_tool == 'FILL':
|
2019-12-17 17:14:05 +01:00
|
|
|
row = col.row(align=True)
|
|
|
|
row.prop(gp_settings, "fill_draw_mode", text="Boundary")
|
|
|
|
row.prop(gp_settings, "show_fill_boundary", text="", icon='GRID')
|
|
|
|
col.separator()
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
col.prop(gp_settings, "fill_factor", text="Resolution")
|
|
|
|
if gp_settings.fill_draw_mode != 'STROKE':
|
|
|
|
col.prop(gp_settings, "show_fill", text="Ignore Transparent Strokes")
|
|
|
|
col.prop(gp_settings, "fill_threshold", text="Threshold")
|
2018-07-31 10:22:19 +02:00
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
|
2019-12-17 17:14:05 +01:00
|
|
|
class VIEW3D_PT_tools_grease_pencil_brush_stroke(Panel, View3DPanel):
|
|
|
|
bl_context = ".greasepencil_paint"
|
|
|
|
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_settings'
|
|
|
|
bl_label = "Stroke"
|
|
|
|
bl_category = "Tool"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
brush = context.tool_settings.gpencil_paint.brush
|
|
|
|
return brush is not None and brush.gpencil_tool == 'DRAW'
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class VIEW3D_PT_tools_grease_pencil_brush_stabilizer(Panel, View3DPanel):
|
2018-07-31 10:22:19 +02:00
|
|
|
bl_context = ".greasepencil_paint"
|
2019-12-17 17:14:05 +01:00
|
|
|
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_stroke'
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_label = "Stabilize Stroke"
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
2018-07-31 10:22:19 +02:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
2018-12-17 17:17:43 +11:00
|
|
|
brush = context.tool_settings.gpencil_paint.brush
|
2018-11-02 09:10:23 +11:00
|
|
|
return brush is not None and brush.gpencil_tool == 'DRAW'
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
def draw_header(self, context):
|
2019-12-16 14:29:03 +11:00
|
|
|
if self.is_popover:
|
|
|
|
return
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
2018-12-17 17:17:43 +11:00
|
|
|
brush = context.tool_settings.gpencil_paint.brush
|
2018-07-31 10:22:19 +02:00
|
|
|
gp_settings = brush.gpencil_settings
|
2018-10-31 09:27:40 +11:00
|
|
|
self.layout.prop(gp_settings, "use_settings_stabilizer", text="")
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
2018-12-17 17:17:43 +11:00
|
|
|
brush = context.tool_settings.gpencil_paint.brush
|
2018-07-31 10:22:19 +02:00
|
|
|
gp_settings = brush.gpencil_settings
|
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
if self.is_popover:
|
|
|
|
row = layout.row()
|
|
|
|
row.prop(gp_settings, "use_settings_stabilizer", text="")
|
|
|
|
row.label(text=self.bl_label)
|
|
|
|
|
|
|
|
col = layout.column()
|
|
|
|
col.active = gp_settings.use_settings_stabilizer
|
2018-07-31 10:22:19 +02:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
col.prop(brush, "smooth_stroke_radius", text="Radius", slider=True)
|
|
|
|
col.prop(brush, "smooth_stroke_factor", text="Factor", slider=True)
|
2018-07-31 10:22:19 +02:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_brush_post_processing(View3DPanel, Panel):
|
2018-07-31 10:22:19 +02:00
|
|
|
bl_context = ".greasepencil_paint"
|
2019-12-17 17:14:05 +01:00
|
|
|
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_stroke'
|
2019-03-16 12:54:08 +01:00
|
|
|
bl_label = "Post-Processing"
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
2018-12-17 17:17:43 +11:00
|
|
|
brush = context.tool_settings.gpencil_paint.brush
|
2020-03-09 16:27:24 +01:00
|
|
|
return brush is not None and brush.gpencil_tool not in {'ERASE', 'FILL', 'TINT'}
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
def draw_header(self, context):
|
2019-12-16 14:29:03 +11:00
|
|
|
if self.is_popover:
|
|
|
|
return
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
2018-12-17 17:17:43 +11:00
|
|
|
brush = context.tool_settings.gpencil_paint.brush
|
2018-07-31 10:22:19 +02:00
|
|
|
gp_settings = brush.gpencil_settings
|
2018-10-31 09:27:40 +11:00
|
|
|
self.layout.prop(gp_settings, "use_settings_postprocess", text="")
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
2018-12-17 17:17:43 +11:00
|
|
|
brush = context.tool_settings.gpencil_paint.brush
|
2018-07-31 10:22:19 +02:00
|
|
|
gp_settings = brush.gpencil_settings
|
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
if self.is_popover:
|
|
|
|
row = layout.row()
|
|
|
|
row.prop(gp_settings, "use_settings_postprocess", text="")
|
|
|
|
row.label(text=self.bl_label)
|
2018-07-31 10:22:19 +02:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
col = layout.column()
|
|
|
|
col.active = gp_settings.use_settings_postprocess
|
2018-07-31 10:22:19 +02:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
col1 = col.column(align=True)
|
|
|
|
col1.prop(gp_settings, "pen_smooth_factor")
|
|
|
|
col1.prop(gp_settings, "pen_smooth_steps")
|
2018-07-31 10:22:19 +02:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
col1 = col.column(align=True)
|
|
|
|
col1.prop(gp_settings, "pen_subdivision_steps")
|
|
|
|
|
|
|
|
col1 = col.column(align=True)
|
|
|
|
col1.prop(gp_settings, "simplify_factor")
|
|
|
|
|
|
|
|
col1 = col.column(align=True)
|
|
|
|
col1.prop(gp_settings, "trim")
|
2019-02-26 16:04:27 +00:00
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel):
|
|
|
|
bl_context = ".greasepencil_paint"
|
2019-12-17 17:14:05 +01:00
|
|
|
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_stroke'
|
2019-03-16 12:54:08 +01:00
|
|
|
bl_label = "Randomize"
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
2018-07-31 10:22:19 +02:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
2018-12-17 17:17:43 +11:00
|
|
|
brush = context.tool_settings.gpencil_paint.brush
|
2020-03-09 16:27:24 +01:00
|
|
|
return brush is not None and brush.gpencil_tool not in {'ERASE', 'FILL', 'TINT'}
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
def draw_header(self, context):
|
2019-12-16 14:29:03 +11:00
|
|
|
if self.is_popover:
|
|
|
|
return
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
2018-12-17 17:17:43 +11:00
|
|
|
brush = context.tool_settings.gpencil_paint.brush
|
2018-07-31 10:22:19 +02:00
|
|
|
gp_settings = brush.gpencil_settings
|
2018-10-31 09:27:40 +11:00
|
|
|
self.layout.prop(gp_settings, "use_settings_random", text="")
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
2018-12-17 17:17:43 +11:00
|
|
|
brush = context.tool_settings.gpencil_paint.brush
|
2018-07-31 10:22:19 +02:00
|
|
|
gp_settings = brush.gpencil_settings
|
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
if self.is_popover:
|
|
|
|
row = layout.row()
|
|
|
|
row.prop(gp_settings, "use_settings_random", text="")
|
|
|
|
row.label(text=self.bl_label)
|
2018-07-31 10:22:19 +02:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
col = layout.column()
|
|
|
|
col.active = gp_settings.use_settings_random
|
|
|
|
|
|
|
|
col.prop(gp_settings, "random_pressure", text="Pressure", slider=True)
|
|
|
|
col.prop(gp_settings, "random_strength", text="Strength", slider=True)
|
|
|
|
col.prop(gp_settings, "uv_random", text="UV", slider=True)
|
|
|
|
|
|
|
|
row = col.row(align=True)
|
2018-07-31 10:22:19 +02:00
|
|
|
row.prop(gp_settings, "pen_jitter", slider=True)
|
|
|
|
row.prop(gp_settings, "use_jitter_pressure", text="", icon='STYLUS_PRESSURE')
|
|
|
|
|
|
|
|
|
|
|
|
# Grease Pencil drawingcurves
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_brushcurves(View3DPanel, Panel):
|
|
|
|
bl_context = ".greasepencil_paint"
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_settings'
|
2018-07-31 10:22:19 +02:00
|
|
|
bl_label = "Curves"
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
2018-07-31 10:22:19 +02:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
2018-09-12 15:18:05 +02:00
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
2018-12-17 17:17:43 +11:00
|
|
|
brush = context.tool_settings.gpencil_paint.brush
|
2020-03-09 16:27:24 +01:00
|
|
|
return brush is not None and brush.gpencil_tool not in {'ERASE', 'FILL', 'TINT'}
|
2018-09-12 15:18:05 +02:00
|
|
|
|
2018-11-09 18:03:34 +01:00
|
|
|
def draw(self, context):
|
2019-03-17 21:13:25 +11:00
|
|
|
pass
|
2018-11-09 18:03:34 +01:00
|
|
|
|
|
|
|
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_brushcurves_sensitivity(View3DPanel, Panel):
|
|
|
|
bl_context = ".greasepencil_paint"
|
|
|
|
bl_label = "Sensitivity"
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
2018-12-20 13:01:40 +11:00
|
|
|
bl_parent_id = "VIEW3D_PT_tools_grease_pencil_brushcurves"
|
2018-11-09 18:03:34 +01:00
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
|
2018-12-17 17:17:43 +11:00
|
|
|
brush = context.tool_settings.gpencil_paint.brush
|
2018-07-31 10:22:19 +02:00
|
|
|
gp_settings = brush.gpencil_settings
|
|
|
|
|
2019-05-06 13:03:23 +02:00
|
|
|
layout.template_curve_mapping(gp_settings, "curve_sensitivity", brush=True,
|
|
|
|
use_negative_slope=True)
|
2018-07-31 10:22:19 +02:00
|
|
|
|
2018-11-09 18:03:34 +01:00
|
|
|
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_brushcurves_strength(View3DPanel, Panel):
|
|
|
|
bl_context = ".greasepencil_paint"
|
|
|
|
bl_label = "Strength"
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
2018-12-20 13:01:40 +11:00
|
|
|
bl_parent_id = "VIEW3D_PT_tools_grease_pencil_brushcurves"
|
2018-11-09 18:03:34 +01:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
|
2018-12-17 17:17:43 +11:00
|
|
|
brush = context.tool_settings.gpencil_paint.brush
|
2018-11-09 18:03:34 +01:00
|
|
|
gp_settings = brush.gpencil_settings
|
|
|
|
|
2019-05-06 13:03:23 +02:00
|
|
|
layout.template_curve_mapping(gp_settings, "curve_strength", brush=True,
|
|
|
|
use_negative_slope=True)
|
2018-07-31 10:22:19 +02:00
|
|
|
|
2018-11-09 18:03:34 +01:00
|
|
|
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_brushcurves_jitter(View3DPanel, Panel):
|
|
|
|
bl_context = ".greasepencil_paint"
|
|
|
|
bl_label = "Jitter"
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
2018-12-20 13:01:40 +11:00
|
|
|
bl_parent_id = "VIEW3D_PT_tools_grease_pencil_brushcurves"
|
2018-11-09 18:03:34 +01:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
|
2018-12-17 17:17:43 +11:00
|
|
|
brush = context.tool_settings.gpencil_paint.brush
|
2018-11-09 18:03:34 +01:00
|
|
|
gp_settings = brush.gpencil_settings
|
|
|
|
|
2019-05-06 13:03:23 +02:00
|
|
|
layout.template_curve_mapping(gp_settings, "curve_jitter", brush=True,
|
|
|
|
use_negative_slope=True)
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
class VIEW3D_PT_tools_grease_pencil_brush_paint_falloff(GreasePencilBrushFalloff, Panel, View3DPaintPanel):
|
|
|
|
bl_context = ".greasepencil_paint"
|
|
|
|
bl_label = "Falloff"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
ts = context.tool_settings
|
|
|
|
settings = ts.gpencil_paint
|
|
|
|
brush = settings.brush
|
|
|
|
if brush is None:
|
|
|
|
return False
|
|
|
|
|
|
|
|
tool = brush.gpencil_tool
|
|
|
|
|
|
|
|
return (settings and settings.brush and settings.brush.curve and tool == 'TINT')
|
|
|
|
|
|
|
|
|
2017-01-18 19:00:17 +13:00
|
|
|
# Grease Pencil stroke interpolation tools
|
2018-07-31 10:22:19 +02:00
|
|
|
class VIEW3D_PT_tools_grease_pencil_interpolate(Panel):
|
2017-01-18 19:00:17 +13:00
|
|
|
bl_space_type = 'VIEW_3D'
|
2018-07-31 10:22:19 +02:00
|
|
|
bl_region_type = 'HEADER'
|
|
|
|
bl_label = "Interpolate"
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
if context.gpencil_data is None:
|
|
|
|
return False
|
|
|
|
|
|
|
|
gpd = context.gpencil_data
|
|
|
|
return bool(context.editable_gpencil_strokes) and bool(gpd.use_stroke_edit_mode)
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
settings = context.tool_settings.gpencil_interpolate
|
|
|
|
|
|
|
|
col = layout.column(align=True)
|
2018-08-28 12:34:51 +10:00
|
|
|
col.label(text="Interpolate Strokes")
|
2018-07-31 10:22:19 +02:00
|
|
|
col.operator("gpencil.interpolate", text="Interpolate")
|
|
|
|
col.operator("gpencil.interpolate_sequence", text="Sequence")
|
|
|
|
col.operator("gpencil.interpolate_reverse", text="Remove Breakdowns")
|
|
|
|
|
|
|
|
col = layout.column(align=True)
|
|
|
|
col.label(text="Options:")
|
|
|
|
col.prop(settings, "interpolate_all_layers")
|
|
|
|
col.prop(settings, "interpolate_selected_only")
|
|
|
|
|
|
|
|
col = layout.column(align=True)
|
|
|
|
col.label(text="Sequence Options:")
|
|
|
|
col.prop(settings, "type")
|
|
|
|
if settings.type == 'CUSTOM':
|
|
|
|
# TODO: Options for loading/saving curve presets?
|
2019-05-06 13:03:23 +02:00
|
|
|
col.template_curve_mapping(settings, "interpolation_curve", brush=True,
|
|
|
|
use_negative_slope=True)
|
2018-07-31 10:22:19 +02:00
|
|
|
elif settings.type != 'LINEAR':
|
|
|
|
col.prop(settings, "easing")
|
|
|
|
|
|
|
|
if settings.type == 'BACK':
|
|
|
|
layout.prop(settings, "back")
|
2019-03-13 12:53:40 +11:00
|
|
|
elif settings.type == 'ELASTIC':
|
2018-07-31 10:22:19 +02:00
|
|
|
sub = layout.column(align=True)
|
|
|
|
sub.prop(settings, "amplitude")
|
|
|
|
sub.prop(settings, "period")
|
2017-01-18 19:00:17 +13:00
|
|
|
|
|
|
|
|
2015-12-13 21:03:13 +13:00
|
|
|
# Grease Pencil stroke sculpting tools
|
2020-03-09 16:27:24 +01:00
|
|
|
class GreasePencilSculptPanel:
|
2018-07-31 10:22:19 +02:00
|
|
|
bl_context = ".greasepencil_sculpt"
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
2015-12-13 21:03:13 +13:00
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
if context.space_data.type in ('VIEW_3D', 'PROPERTIES'):
|
|
|
|
if context.gpencil_data is None:
|
|
|
|
return False
|
|
|
|
|
|
|
|
gpd = context.gpencil_data
|
|
|
|
return bool(gpd.is_stroke_sculpt_mode)
|
|
|
|
else:
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_sculpt_select(Panel, View3DPanel, GreasePencilSculptPanel):
|
|
|
|
bl_label = "Brushes"
|
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
tool_settings = context.scene.tool_settings
|
|
|
|
gpencil_paint = tool_settings.gpencil_sculpt_paint
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
row = layout.row()
|
|
|
|
row.column().template_ID_preview(gpencil_paint, "brush", new="brush.add_gpencil", rows=3, cols=8)
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
col = row.column()
|
|
|
|
col.menu("VIEW3D_MT_brush_gpencil_context_menu", icon='DOWNARROW_HLT', text="")
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
if context.mode == 'SCULPT_GPENCIL':
|
|
|
|
brush = tool_settings.gpencil_sculpt_paint.brush
|
|
|
|
if brush is not None:
|
|
|
|
col.prop(brush, "use_custom_icon", toggle=True, icon='FILE_IMAGE', text="")
|
|
|
|
|
|
|
|
if(brush.use_custom_icon):
|
|
|
|
layout.row().prop(brush, "icon_filepath", text="")
|
|
|
|
|
|
|
|
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_sculpt_settings(Panel, View3DPanel, GreasePencilSculptPanel):
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_label = "Brush Settings"
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
tool_settings = context.scene.tool_settings
|
|
|
|
settings = tool_settings.gpencil_sculpt_paint
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
brush = settings.brush
|
|
|
|
|
|
|
|
if not self.is_popover:
|
|
|
|
from bl_ui.properties_paint_common import (
|
|
|
|
brush_basic_gpencil_sculpt_settings,
|
|
|
|
)
|
|
|
|
brush_basic_gpencil_sculpt_settings(layout, context, brush)
|
2015-12-13 21:03:13 +13:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
class VIEW3D_PT_tools_grease_pencil_brush_sculpt_falloff(GreasePencilBrushFalloff, Panel, View3DPaintPanel):
|
|
|
|
bl_context = ".greasepencil_sculpt"
|
|
|
|
bl_label = "Falloff"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
ts = context.tool_settings
|
|
|
|
settings = ts.gpencil_sculpt_paint
|
|
|
|
return (settings and settings.brush and settings.brush.curve)
|
2019-12-16 14:29:03 +11:00
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
|
|
|
|
# Grease Pencil weight painting tools
|
|
|
|
class GreasePencilWeightPanel:
|
2018-07-31 10:22:19 +02:00
|
|
|
bl_context = ".greasepencil_weight"
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
2016-08-03 23:31:48 +02:00
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
if context.space_data.type in ('VIEW_3D', 'PROPERTIES'):
|
|
|
|
if context.gpencil_data is None:
|
|
|
|
return False
|
|
|
|
|
|
|
|
gpd = context.gpencil_data
|
|
|
|
return bool(gpd.is_stroke_weight_mode)
|
|
|
|
else:
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_weight_paint_select(View3DPanel, Panel, GreasePencilWeightPanel):
|
|
|
|
bl_label = "Brushes"
|
|
|
|
|
2018-07-31 10:22:19 +02:00
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
2018-06-05 16:32:11 +02:00
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
tool_settings = context.scene.tool_settings
|
|
|
|
gpencil_paint = tool_settings.gpencil_weight_paint
|
2018-06-05 16:32:11 +02:00
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
row = layout.row()
|
|
|
|
row.column().template_ID_preview(gpencil_paint, "brush", new="brush.add_gpencil", rows=3, cols=8)
|
2018-07-31 10:22:19 +02:00
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
col = row.column()
|
|
|
|
col.menu("VIEW3D_MT_brush_gpencil_context_menu", icon='DOWNARROW_HLT', text="")
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
if context.mode == 'WEIGHT_GPENCIL':
|
|
|
|
brush = tool_settings.gpencil_weight_paint.brush
|
|
|
|
if brush is not None:
|
|
|
|
col.prop(brush, "use_custom_icon", toggle=True, icon='FILE_IMAGE', text="")
|
|
|
|
|
|
|
|
if(brush.use_custom_icon):
|
|
|
|
layout.row().prop(brush, "icon_filepath", text="")
|
|
|
|
|
|
|
|
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_weight_paint_settings(Panel, View3DPanel, GreasePencilWeightPanel):
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_label = "Brush Settings"
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
tool_settings = context.scene.tool_settings
|
|
|
|
settings = tool_settings.gpencil_weight_paint
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
brush = settings.brush
|
|
|
|
|
2019-01-02 14:36:56 +11:00
|
|
|
if not self.is_popover:
|
2019-06-11 16:08:32 +10:00
|
|
|
from bl_ui.properties_paint_common import (
|
2019-01-02 14:36:56 +11:00
|
|
|
brush_basic_gpencil_weight_settings,
|
|
|
|
)
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
brush_basic_gpencil_weight_settings(layout, context, brush)
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
class VIEW3D_PT_tools_grease_pencil_brush_weight_falloff(GreasePencilBrushFalloff, Panel, View3DPaintPanel):
|
|
|
|
bl_context = ".greasepencil_weight"
|
|
|
|
bl_label = "Falloff"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
ts = context.tool_settings
|
|
|
|
settings = ts.gpencil_weight_paint
|
|
|
|
brush = settings.brush
|
|
|
|
return (settings and settings.brush and settings.brush.curve)
|
|
|
|
|
|
|
|
|
|
|
|
# Grease Pencil vertex painting tools
|
|
|
|
class GreasePencilVertexPanel:
|
|
|
|
bl_context = ".greasepencil_vertex"
|
|
|
|
bl_category = "Tool"
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
if context.space_data.type in ('VIEW_3D', 'PROPERTIES'):
|
|
|
|
if context.gpencil_data is None:
|
|
|
|
return False
|
|
|
|
|
|
|
|
gpd = context.gpencil_data
|
|
|
|
return bool(gpd.is_stroke_vertex_mode)
|
|
|
|
else:
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_vertex_paint_select(View3DPanel, Panel, GreasePencilVertexPanel):
|
|
|
|
bl_label = "Brushes"
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
|
|
|
tool_settings = context.scene.tool_settings
|
|
|
|
gpencil_paint = tool_settings.gpencil_vertex_paint
|
|
|
|
|
|
|
|
row = layout.row()
|
|
|
|
row.column().template_ID_preview(gpencil_paint, "brush", new="brush.add_gpencil", rows=3, cols=8)
|
|
|
|
|
|
|
|
col = row.column()
|
|
|
|
col.menu("VIEW3D_MT_brush_gpencil_context_menu", icon='DOWNARROW_HLT', text="")
|
|
|
|
|
|
|
|
if context.mode == 'VERTEX_GPENCIL':
|
|
|
|
brush = tool_settings.gpencil_vertex_paint.brush
|
|
|
|
if brush is not None:
|
|
|
|
col.prop(brush, "use_custom_icon", toggle=True, icon='FILE_IMAGE', text="")
|
|
|
|
|
|
|
|
if(brush.use_custom_icon):
|
|
|
|
layout.row().prop(brush, "icon_filepath", text="")
|
|
|
|
|
|
|
|
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_vertex_paint_settings(Panel, View3DPanel, GreasePencilVertexPanel):
|
|
|
|
bl_label = "Brush Settings"
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
|
|
|
|
tool_settings = context.scene.tool_settings
|
|
|
|
settings = tool_settings.gpencil_vertex_paint
|
|
|
|
brush = settings.brush
|
|
|
|
|
|
|
|
if not self.is_popover:
|
|
|
|
from bl_ui.properties_paint_common import (
|
|
|
|
brush_basic_gpencil_vertex_settings,
|
|
|
|
)
|
|
|
|
brush_basic_gpencil_vertex_settings(layout, context, brush)
|
|
|
|
|
|
|
|
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_brush_vertex_color(View3DPanel, Panel):
|
|
|
|
bl_context = ".greasepencil_vertex"
|
|
|
|
bl_label = "Color"
|
|
|
|
bl_category = "Tool"
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
ob = context.object
|
|
|
|
ts = context.tool_settings
|
|
|
|
settings = ts.gpencil_vertex_paint
|
|
|
|
brush = settings.brush
|
|
|
|
|
|
|
|
if ob is None or brush is None:
|
|
|
|
return False
|
|
|
|
|
|
|
|
if context.region.type == 'TOOL_HEADER' or brush.gpencil_vertex_tool in {'BLUR', 'AVERAGE', 'SMEAR'}:
|
|
|
|
return False
|
|
|
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
ts = context.tool_settings
|
|
|
|
settings = ts.gpencil_vertex_paint
|
|
|
|
brush = settings.brush
|
|
|
|
gp_settings = brush.gpencil_settings
|
|
|
|
|
|
|
|
col = layout.column()
|
|
|
|
|
|
|
|
col.template_color_picker(brush, "color", value_slider=True)
|
|
|
|
|
|
|
|
sub_row = col.row(align=True)
|
|
|
|
sub_row.prop(brush, "color", text="")
|
|
|
|
sub_row.prop(brush, "secondary_color", text="")
|
|
|
|
|
|
|
|
sub_row.operator("gpencil.tint_flip", icon='FILE_REFRESH', text="")
|
|
|
|
|
|
|
|
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_brush_vertex_falloff(GreasePencilBrushFalloff, Panel, View3DPaintPanel):
|
|
|
|
bl_context = ".greasepencil_vertex"
|
|
|
|
bl_label = "Falloff"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
ts = context.tool_settings
|
|
|
|
settings = ts.gpencil_vertex_paint
|
|
|
|
return (settings and settings.brush and settings.brush.curve)
|
|
|
|
|
|
|
|
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_brush_vertex_palette(View3DPanel, Panel):
|
|
|
|
bl_context = ".greasepencil_vertex"
|
|
|
|
bl_label = "Palette"
|
|
|
|
bl_category = "Tool"
|
|
|
|
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_vertex_color'
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
ob = context.object
|
|
|
|
ts = context.tool_settings
|
|
|
|
settings = ts.gpencil_vertex_paint
|
|
|
|
brush = settings.brush
|
|
|
|
|
|
|
|
if ob is None or brush is None:
|
|
|
|
return False
|
|
|
|
|
|
|
|
if brush.gpencil_vertex_tool in {'BLUR', 'AVERAGE', 'SMEAR'}:
|
|
|
|
return False
|
|
|
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
ts = context.tool_settings
|
|
|
|
settings = ts.gpencil_vertex_paint
|
|
|
|
|
|
|
|
col = layout.column()
|
|
|
|
|
|
|
|
row = col.row(align=True)
|
|
|
|
row.template_ID(settings, "palette", new="palette.new")
|
|
|
|
if settings.palette:
|
|
|
|
col.template_palette(settings, "palette", color=True)
|
|
|
|
|
|
|
|
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_brush_mixcolor(View3DPanel, Panel):
|
|
|
|
bl_context = ".greasepencil_paint"
|
|
|
|
bl_label = "Color"
|
|
|
|
bl_category = "Tool"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
ob = context.object
|
|
|
|
ts = context.tool_settings
|
|
|
|
settings = ts.gpencil_paint
|
|
|
|
brush = settings.brush
|
|
|
|
|
|
|
|
if ob is None or brush is None:
|
|
|
|
return False
|
|
|
|
|
|
|
|
if context.region.type == 'TOOL_HEADER':
|
|
|
|
return False
|
|
|
|
|
|
|
|
if brush.gpencil_tool == 'TINT':
|
|
|
|
return True
|
|
|
|
|
|
|
|
if brush.gpencil_tool not in {'DRAW', 'FILL'}:
|
|
|
|
return False
|
|
|
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
ts = context.tool_settings
|
|
|
|
settings = ts.gpencil_paint
|
|
|
|
brush = settings.brush
|
|
|
|
gp_settings = brush.gpencil_settings
|
|
|
|
|
|
|
|
if brush.gpencil_tool != 'TINT':
|
|
|
|
row = layout.row()
|
|
|
|
row.prop(settings, "color_mode", expand=True)
|
|
|
|
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
col = layout.column()
|
|
|
|
col.enabled = settings.color_mode == 'VERTEXCOLOR' or brush.gpencil_tool == 'TINT'
|
|
|
|
|
|
|
|
col.template_color_picker(brush, "color", value_slider=True)
|
|
|
|
|
|
|
|
sub_row = col.row(align=True)
|
|
|
|
sub_row.prop(brush, "color", text="")
|
|
|
|
sub_row.prop(brush, "secondary_color", text="")
|
|
|
|
|
|
|
|
sub_row.operator("gpencil.tint_flip", icon='FILE_REFRESH', text="")
|
|
|
|
|
|
|
|
if brush.gpencil_tool in {'DRAW', 'FILL'}:
|
|
|
|
col.prop(gp_settings, "vertex_mode", text="Mode")
|
|
|
|
col.prop(gp_settings, "vertex_color_factor", slider=True, text="Mix Factor")
|
|
|
|
|
|
|
|
if brush.gpencil_tool == 'TINT':
|
|
|
|
col.prop(gp_settings, "vertex_mode", text="Mode")
|
|
|
|
|
|
|
|
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_brush_mix_palette(View3DPanel, Panel):
|
|
|
|
bl_context = ".greasepencil_paint"
|
|
|
|
bl_label = "Palette"
|
|
|
|
bl_category = "Tool"
|
|
|
|
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_mixcolor'
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
ob = context.object
|
|
|
|
ts = context.tool_settings
|
|
|
|
settings = ts.gpencil_paint
|
|
|
|
brush = settings.brush
|
|
|
|
|
|
|
|
if ob is None or brush is None:
|
|
|
|
return False
|
|
|
|
|
|
|
|
if brush.gpencil_tool == 'TINT':
|
|
|
|
return True
|
|
|
|
|
|
|
|
if brush.gpencil_tool not in {'DRAW', 'FILL'}:
|
|
|
|
return False
|
|
|
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
layout.use_property_split = True
|
|
|
|
layout.use_property_decorate = False
|
|
|
|
ts = context.tool_settings
|
|
|
|
settings = ts.gpencil_paint
|
|
|
|
brush = settings.brush
|
|
|
|
|
|
|
|
col = layout.column()
|
|
|
|
col.enabled = settings.color_mode == 'VERTEXCOLOR' or brush.gpencil_tool == 'TINT'
|
|
|
|
|
|
|
|
row = col.row(align=True)
|
|
|
|
row.template_ID(settings, "palette", new="palette.new")
|
|
|
|
if settings.palette:
|
|
|
|
col.template_palette(settings, "palette", color=True)
|
|
|
|
|
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class VIEW3D_PT_tools_grease_pencil_sculpt_options(GreasePencilSculptOptionsPanel, Panel, View3DPanel):
|
|
|
|
bl_context = ".greasepencil_sculpt"
|
|
|
|
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_sculpt_settings'
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_label = "Sculpt Strokes"
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
# Grease Pencil Brush Appearance (one for each mode)
|
|
|
|
class VIEW3D_PT_tools_grease_pencil_paint_appearance(GreasePencilDisplayPanel, Panel, View3DPanel):
|
|
|
|
bl_context = ".greasepencil_paint"
|
|
|
|
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_brush_settings'
|
|
|
|
bl_label = "Cursor"
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class VIEW3D_PT_tools_grease_pencil_sculpt_appearance(GreasePencilDisplayPanel, Panel, View3DPanel):
|
2018-09-21 20:15:25 +02:00
|
|
|
bl_context = ".greasepencil_sculpt"
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_sculpt_settings'
|
|
|
|
bl_label = "Cursor"
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
2018-09-21 20:15:25 +02:00
|
|
|
|
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class VIEW3D_PT_tools_grease_pencil_weight_appearance(GreasePencilDisplayPanel, Panel, View3DPanel):
|
2018-07-31 10:22:19 +02:00
|
|
|
bl_context = ".greasepencil_weight"
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_weight_paint_settings'
|
2019-05-10 13:43:07 +10:00
|
|
|
bl_category = "Tool"
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
bl_label = "Cursor"
|
2018-07-31 10:22:19 +02:00
|
|
|
|
2020-03-09 16:27:24 +01:00
|
|
|
class VIEW3D_PT_tools_grease_pencil_vertex_appearance(GreasePencilDisplayPanel, Panel, View3DPanel):
|
|
|
|
bl_context = ".greasepencil_vertex"
|
|
|
|
bl_parent_id = 'VIEW3D_PT_tools_grease_pencil_vertex_paint_settings'
|
|
|
|
bl_category = "Tool"
|
|
|
|
bl_label = "Cursor"
|
2018-07-31 10:22:19 +02:00
|
|
|
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
class VIEW3D_PT_gpencil_brush_presets(Panel, PresetPanel):
|
2018-07-31 10:22:19 +02:00
|
|
|
"""Brush settings"""
|
|
|
|
bl_label = "Brush Presets"
|
|
|
|
preset_subdir = "gpencil_brush"
|
|
|
|
preset_operator = "script.execute_preset"
|
|
|
|
preset_add_operator = "scene.gpencil_brush_preset_add"
|
2016-08-03 23:31:48 +02:00
|
|
|
|
|
|
|
|
2017-03-18 20:03:24 +11:00
|
|
|
classes = (
|
2019-08-08 22:54:57 +02:00
|
|
|
VIEW3D_MT_brush_context_menu,
|
2020-03-09 16:27:24 +01:00
|
|
|
VIEW3D_MT_brush_gpencil_context_menu,
|
2019-08-08 22:54:57 +02:00
|
|
|
VIEW3D_MT_brush_context_menu_paint_modes,
|
2019-09-12 00:50:37 +10:00
|
|
|
VIEW3D_PT_tools_object_options,
|
|
|
|
VIEW3D_PT_tools_object_options_transform,
|
2017-03-20 02:34:32 +11:00
|
|
|
VIEW3D_PT_tools_meshedit_options,
|
2019-05-21 22:50:02 +02:00
|
|
|
VIEW3D_PT_tools_meshedit_options_automerge,
|
2017-03-20 02:34:32 +11:00
|
|
|
VIEW3D_PT_tools_curveedit_options_stroke,
|
|
|
|
VIEW3D_PT_tools_armatureedit_options,
|
|
|
|
VIEW3D_PT_tools_posemode_options,
|
2020-03-05 08:05:21 +11:00
|
|
|
|
2018-10-05 17:40:24 +02:00
|
|
|
VIEW3D_PT_slots_projectpaint,
|
2019-12-16 13:43:45 +11:00
|
|
|
VIEW3D_PT_tools_brush_select,
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
VIEW3D_PT_tools_brush_settings,
|
2019-03-19 18:17:50 +01:00
|
|
|
VIEW3D_PT_tools_brush_color,
|
|
|
|
VIEW3D_PT_tools_brush_swatches,
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
VIEW3D_PT_tools_brush_settings_advanced,
|
2019-03-19 18:17:50 +01:00
|
|
|
VIEW3D_PT_tools_brush_clone,
|
2017-03-20 02:34:32 +11:00
|
|
|
TEXTURE_UL_texpaintslots,
|
|
|
|
VIEW3D_MT_tools_projectpaint_uvlayer,
|
2017-03-18 20:03:24 +11:00
|
|
|
VIEW3D_PT_tools_brush_texture,
|
2017-03-20 02:34:32 +11:00
|
|
|
VIEW3D_PT_tools_mask_texture,
|
|
|
|
VIEW3D_PT_tools_brush_stroke,
|
2018-10-31 17:23:43 +01:00
|
|
|
VIEW3D_PT_tools_brush_stroke_smooth_stroke,
|
2019-03-19 18:17:50 +01:00
|
|
|
VIEW3D_PT_tools_brush_falloff,
|
|
|
|
VIEW3D_PT_tools_brush_falloff_frontface,
|
|
|
|
VIEW3D_PT_tools_brush_falloff_normal,
|
|
|
|
VIEW3D_PT_tools_brush_display,
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
2017-03-20 02:34:32 +11:00
|
|
|
VIEW3D_PT_sculpt_dyntopo,
|
2019-09-26 15:58:33 +02:00
|
|
|
VIEW3D_PT_sculpt_voxel_remesh,
|
2019-03-20 14:09:55 +01:00
|
|
|
VIEW3D_PT_sculpt_symmetry,
|
2019-05-21 15:49:36 +10:00
|
|
|
VIEW3D_PT_sculpt_symmetry_for_topbar,
|
2017-03-20 02:34:32 +11:00
|
|
|
VIEW3D_PT_sculpt_options,
|
2018-10-31 17:23:43 +01:00
|
|
|
VIEW3D_PT_sculpt_options_gravity,
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
2019-12-12 07:19:59 +01:00
|
|
|
VIEW3D_PT_tools_weightpaint_symmetry,
|
|
|
|
VIEW3D_PT_tools_weightpaint_symmetry_for_topbar,
|
2017-03-20 02:34:32 +11:00
|
|
|
VIEW3D_PT_tools_weightpaint_options,
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
2017-09-28 01:38:17 +10:00
|
|
|
VIEW3D_PT_tools_vertexpaint_symmetry,
|
2019-05-21 15:49:36 +10:00
|
|
|
VIEW3D_PT_tools_vertexpaint_symmetry_for_topbar,
|
2019-03-20 14:09:55 +01:00
|
|
|
VIEW3D_PT_tools_vertexpaint_options,
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
2020-01-23 11:45:48 +01:00
|
|
|
VIEW3D_PT_mask,
|
|
|
|
VIEW3D_PT_stencil_projectpaint,
|
|
|
|
VIEW3D_PT_tools_imagepaint_options_cavity,
|
|
|
|
|
2017-03-20 02:34:32 +11:00
|
|
|
VIEW3D_PT_tools_imagepaint_symmetry,
|
2019-03-20 14:09:55 +01:00
|
|
|
VIEW3D_PT_tools_imagepaint_options,
|
2020-03-05 08:05:21 +11:00
|
|
|
|
2019-03-20 14:09:55 +01:00
|
|
|
VIEW3D_PT_tools_imagepaint_options_external,
|
2017-03-20 02:34:32 +11:00
|
|
|
VIEW3D_MT_tools_projectpaint_stencil,
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
|
2017-03-20 02:34:32 +11:00
|
|
|
VIEW3D_PT_tools_particlemode,
|
2019-03-18 21:30:56 +01:00
|
|
|
VIEW3D_PT_tools_particlemode_options,
|
|
|
|
VIEW3D_PT_tools_particlemode_options_shapecut,
|
|
|
|
VIEW3D_PT_tools_particlemode_options_display,
|
2018-07-31 10:22:19 +02:00
|
|
|
|
|
|
|
VIEW3D_PT_gpencil_brush_presets,
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
VIEW3D_PT_tools_grease_pencil_brush_select,
|
2018-07-31 10:22:19 +02:00
|
|
|
VIEW3D_PT_tools_grease_pencil_brush_settings,
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
VIEW3D_PT_tools_grease_pencil_brush_advanced,
|
2019-12-17 17:14:05 +01:00
|
|
|
VIEW3D_PT_tools_grease_pencil_brush_stroke,
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
VIEW3D_PT_tools_grease_pencil_brush_post_processing,
|
2018-07-31 10:22:19 +02:00
|
|
|
VIEW3D_PT_tools_grease_pencil_brush_random,
|
2019-12-17 17:14:05 +01:00
|
|
|
VIEW3D_PT_tools_grease_pencil_brush_stabilizer,
|
2017-03-20 02:34:32 +11:00
|
|
|
VIEW3D_PT_tools_grease_pencil_brushcurves,
|
2018-11-09 18:03:34 +01:00
|
|
|
VIEW3D_PT_tools_grease_pencil_brushcurves_sensitivity,
|
|
|
|
VIEW3D_PT_tools_grease_pencil_brushcurves_strength,
|
|
|
|
VIEW3D_PT_tools_grease_pencil_brushcurves_jitter,
|
2018-07-31 10:22:19 +02:00
|
|
|
VIEW3D_PT_tools_grease_pencil_paint_appearance,
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
VIEW3D_PT_tools_grease_pencil_sculpt_select,
|
|
|
|
VIEW3D_PT_tools_grease_pencil_sculpt_settings,
|
2018-09-21 20:15:25 +02:00
|
|
|
VIEW3D_PT_tools_grease_pencil_sculpt_options,
|
2018-07-31 10:22:19 +02:00
|
|
|
VIEW3D_PT_tools_grease_pencil_sculpt_appearance,
|
UI: Brush Settings overhaul
This makes a number of changes to the tool settings brush UI:
- All brush-related controls are now grouped together, so you can see which items are brush settings are which are not. Previously it was all jumbled together.
- The brush picker is in a separate panel, so that you can switch brushes without worrying about the settings, or vice versa.
- Custom Icon settings moved from the Display settings(now known as Cursor) to the Brushes panel.
- UnifiedPaintSettings panels are removed and the contained options are now next to their relevant setting with a globe icon toggle. This is not displayed in the header.
- 2D Falloff and Absolute Jitter toggles were changed into enums, to make it clearer what happens when they are on or off.
- Adjust Strength for Spacing option was in the Options panel in some modes, but in the Stroke panel in others. It is now always under Stroke.
- Display (now Cursor) panel was reorganized, settings renamed.
- 2-option enums are annoying as a drop-down menu, so they are now drawn with expand=True.
- Smooth Stroke and Stabilizer options in grease pencil and other paint modes are now both called "Stabilize Stroke", for consistency and clarity.
- De-duplicated some drawing code between various painting modes' brush options. I tried to keep de-duplication reasonable and easy to follow.
- A few more tweaks - see D5928 for the extensive list.
Most of the patch is written by Demeter Dzadik, with some additions by myself
Differential Revision: https://developer.blender.org/D5928
Reviewers: Pablo Dobarro, Bastien Montagne, Matias Mendiola
2019-12-14 18:48:18 +01:00
|
|
|
VIEW3D_PT_tools_grease_pencil_weight_paint_select,
|
|
|
|
VIEW3D_PT_tools_grease_pencil_weight_paint_settings,
|
2018-07-31 10:22:19 +02:00
|
|
|
VIEW3D_PT_tools_grease_pencil_weight_appearance,
|
2020-03-09 16:27:24 +01:00
|
|
|
VIEW3D_PT_tools_grease_pencil_vertex_paint_select,
|
|
|
|
VIEW3D_PT_tools_grease_pencil_vertex_paint_settings,
|
|
|
|
VIEW3D_PT_tools_grease_pencil_vertex_appearance,
|
2018-07-31 10:22:19 +02:00
|
|
|
VIEW3D_PT_tools_grease_pencil_interpolate,
|
2020-03-09 16:27:24 +01:00
|
|
|
VIEW3D_PT_tools_grease_pencil_brush_mixcolor,
|
|
|
|
VIEW3D_PT_tools_grease_pencil_brush_mix_palette,
|
|
|
|
|
|
|
|
VIEW3D_PT_tools_grease_pencil_brush_paint_falloff,
|
|
|
|
VIEW3D_PT_tools_grease_pencil_brush_sculpt_falloff,
|
|
|
|
VIEW3D_PT_tools_grease_pencil_brush_weight_falloff,
|
|
|
|
VIEW3D_PT_tools_grease_pencil_brush_vertex_color,
|
|
|
|
VIEW3D_PT_tools_grease_pencil_brush_vertex_palette,
|
|
|
|
VIEW3D_PT_tools_grease_pencil_brush_vertex_falloff,
|
2017-03-18 20:03:24 +11:00
|
|
|
)
|
|
|
|
|
2011-04-04 10:13:04 +00:00
|
|
|
if __name__ == "__main__": # only for live edit.
|
2017-03-18 20:03:24 +11:00
|
|
|
from bpy.utils import register_class
|
|
|
|
for cls in classes:
|
|
|
|
register_class(cls)
|