Merge branch 'blender-v4.3-release'
This commit is contained in:
@@ -488,7 +488,7 @@ static void OVERLAY_cache_populate(void *vedata, Object *ob)
|
||||
else if (in_sculpt_curve_mode) {
|
||||
OVERLAY_sculpt_curves_cache_populate(data, ob);
|
||||
}
|
||||
else if (in_grease_pencil_sculpt_mode) {
|
||||
else if (in_grease_pencil_sculpt_mode && !pd->hide_overlays) {
|
||||
OVERLAY_sculpt_grease_pencil_cache_populate(data, ob);
|
||||
}
|
||||
|
||||
|
||||
@@ -2133,6 +2133,12 @@ static void paint_draw_cursor(bContext *C, int x, int y, void * /*unused*/)
|
||||
}
|
||||
|
||||
if (!paint_cursor_is_brush_cursor_enabled(&pcontext)) {
|
||||
/* For Grease Pencil draw mode, we want to we only render a small mouse cursor (dot) if the
|
||||
* paint cursor is disabled so that the default mouse cursor doesn't get in the way of tablet
|
||||
* users. See #130089. */
|
||||
if (pcontext.mode == PaintMode::GPencil) {
|
||||
WM_cursor_set(pcontext.win, WM_CURSOR_DOT);
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (paint_cursor_is_3d_view_navigating(&pcontext)) {
|
||||
|
||||
Reference in New Issue
Block a user