griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.3-release'

Browse Source
This commit is contained in:
Falk David
2024-10-03 17:06:47 +02:00
parent e34feb347c 0872e898bc
commit 050133078f
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/blender/editors/sculpt_paint/paint_cursor.cc
View File

@@ -1524,17 +1524,16 @@ static void grease_pencil_brush_cursor_draw(PaintCursorContext *pcontext)
return;
}
/* Hide the cursor while drawing. */
if (grease_pencil->runtime->is_drawing_stroke) {
return;
}
float3 color(1.0f);
const int x = pcontext->x;
const int y = pcontext->y;
/* for paint use paint brush size and color */
if (pcontext->mode == PaintMode::GPencil) {
/* Hide the cursor while drawing. */
if (grease_pencil->runtime->is_drawing_stroke) {
return;
}
/* Eraser has a special shape and uses a different shader program. */
if (brush->gpencil_brush_type == GPAINT_BRUSH_TYPE_ERASE ||
grease_pencil->runtime->temp_use_eraser)
@@ -1551,20 +1550,27 @@ static void grease_pencil_brush_cursor_draw(PaintCursorContext *pcontext)
return;
}
/* Hide the cursor while drawing. */
if (grease_pencil->runtime->is_drawing_stroke) {
if (brush->gpencil_brush_type == GPAINT_BRUSH_TYPE_FILL) {
/* Don't draw a paint cursor for the fill tool. */
return;
}
if (brush->gpencil_brush_type == GPAINT_BRUSH_TYPE_DRAW &&
(brush->flag & BRUSH_LOCK_SIZE) != 0)
{
const bke::greasepencil::Layer *layer = grease_pencil->get_active_layer();
const ed::greasepencil::DrawingPlacement placement(
*pcontext->scene, *pcontext->region, *pcontext->vc.v3d, *object, layer);
const float3 location = placement.project(float2(pcontext->x, pcontext->y));
pcontext->pixel_radius = project_brush_radius(
&pcontext->vc, brush->unprojected_radius, location);
if (brush->gpencil_brush_type == GPAINT_BRUSH_TYPE_TINT) {
pcontext->pixel_radius = brush->size;
}
if (brush->gpencil_brush_type == GPAINT_BRUSH_TYPE_DRAW) {
if ((brush->flag & BRUSH_LOCK_SIZE) != 0) {
const bke::greasepencil::Layer *layer = grease_pencil->get_active_layer();
const ed::greasepencil::DrawingPlacement placement(
*pcontext->scene, *pcontext->region, *pcontext->vc.v3d, *object, layer);
const float3 location = placement.project(float2(pcontext->x, pcontext->y));
pcontext->pixel_radius = project_brush_radius(
&pcontext->vc, brush->unprojected_radius, location);
}
else {
pcontext->pixel_radius = brush->size;
}
}
/* Get current drawing material. */