archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix uv-sculpt use w/ tool-system

Browse Source
This commit is contained in:
Campbell Barton
2018-11-21 17:56:10 +11:00
parent 77a80d9f2f
commit 7de712e1e5
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
View File

@@ -1002,7 +1002,7 @@ class _defs_image_uv_sculpt:
return generate_from_enum_ex(
context,
icon_prefix="brush.uv_sculpt.",
data=context.tool_settings,
type=bpy.types.ToolSettings,
attr="uv_sculpt_tool",
)

2
source/blender/blenkernel/BKE_paint.h
View File

@@ -90,6 +90,8 @@ typedef enum ePaintMode {
PAINT_MODE_INVALID = 7,
} ePaintMode;
#define PAINT_MODE_HAS_BRUSH(mode) !ELEM(mode, PAINT_MODE_SCULPT_UV)
/* overlay invalidation */
typedef enum eOverlayControlFlags {
PAINT_OVERLAY_INVALID_TEXTURE_PRIMARY = 1,

23
source/blender/blenkernel/intern/paint.c
View File

@@ -689,29 +689,30 @@ bool BKE_paint_ensure(const ToolSettings *ts, struct Paint **r_paint)
paint->flags |= PAINT_SHOW_BRUSH;
*r_paint = paint;
BKE_paint_runtime_init(ts, paint);
*r_paint = paint;
return false;
}
void BKE_paint_init(Main *bmain, Scene *sce, ePaintMode mode, const char col[3])
{
UnifiedPaintSettings *ups = &sce->toolsettings->unified_paint_settings;
Brush *brush;
Paint *paint = BKE_paint_get_active_from_paintmode(sce, mode);
/* If there's no brush, create one */
brush = BKE_paint_brush(paint);
if (brush == NULL) {
eObjectMode ob_mode = BKE_paint_object_mode_from_paintmode(mode);
brush = BKE_brush_first_search(bmain, ob_mode);
if (!brush) {
brush = BKE_brush_add(bmain, "Brush", ob_mode);
id_us_min(&brush->id); /* fake user only */
if (PAINT_MODE_HAS_BRUSH(mode)) {
Brush *brush = BKE_paint_brush(paint);
if (brush == NULL) {
eObjectMode ob_mode = BKE_paint_object_mode_from_paintmode(mode);
brush = BKE_brush_first_search(bmain, ob_mode);
if (!brush) {
brush = BKE_brush_add(bmain, "Brush", ob_mode);
id_us_min(&brush->id); /* fake user only */
}
BKE_paint_brush_set(paint, brush);
}
BKE_paint_brush_set(paint, brush);
}
memcpy(paint->paint_cursor_col, col, 3);