edgevoid/armorpaint
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

paint: merge sculpt

Browse Source
This commit is contained in:
luboslenco
2026-06-11 20:01:25 +02:00
parent 881171ec18
commit 5c19a16640
14 changed files with 923 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
paint/sources/ui/tab_layers.c
+4 -4
View File
@@ -450,7 +450,7 @@ void tab_layers_draw_layer_slot_full(slot_layer_t *l, i32 i) {
}
// Blending combo
if (!slot_layer_is_group(l) && !slot_layer_is_mask(l) && !slot_layer_is_filter(l)) {
if (!slot_layer_is_group(l) && !slot_layer_is_mask(l) && !slot_layer_is_filter(l) && l->texpaint_sculpt == NULL) {
g_ui->_x = uix + uiw * 0.60;
g_ui->_y = uiy;
g_ui->_w = uiw * 0.30;
@@ -460,7 +460,7 @@ void tab_layers_draw_layer_slot_full(slot_layer_t *l, i32 i) {
// Object combo
if (!slot_layer_is_group(l) && !slot_layer_is_mask(l) && !slot_layer_is_filter(l)) {
g_ui->_x = uix + uiw * 0.60;
g_ui->_y = uiy + center * 2;
g_ui->_y = l->texpaint_sculpt != NULL ? uiy + center : uiy + center * 2;
g_ui->_w = uiw * 0.30;
tab_layers_combo_object(l, false);
}
@@ -632,7 +632,7 @@ void tab_layers_draw_layer_context_menu_draw() {
ui_menu_keep_open = true;
}
if (!slot_layer_is_group(l) && !slot_layer_is_mask(l) && !slot_layer_is_filter(l)) {
if (!slot_layer_is_group(l) && !slot_layer_is_mask(l) && !slot_layer_is_filter(l) && l->texpaint_sculpt == NULL) {
if (tab_layers_combo_blending(l, true)->changed) {
ui_menu_keep_open = true;
}
@@ -915,7 +915,7 @@ void tab_layers_draw_layer_slot(slot_layer_t *l, i32 i, bool mini) {
}
bool is_sculpt_layer = l->texpaint_sculpt != NULL;
if (g_config->workflow == WORKFLOW_SCULPT && !is_sculpt_layer) {
if (g_config->workflow == WORKFLOW_SCULPT && !is_sculpt_layer && !slot_layer_is_group(l) && !slot_layer_is_mask(l)) {
return;
}
if (g_config->workflow != WORKFLOW_SCULPT && is_sculpt_layer) {
paint/sources/ui/ui_menubar.c
+2 -5
View File
@@ -812,12 +812,9 @@ void ui_menubar_draw_category_items() {
(void *[]){
tr("PBR"),
tr("Base"),
tr("Sculpt"),
},
2);
if (g_config->experimental) {
any_array_push(workflow_items, tr("Sculpt"));
}
3);
g_config->workflow = ui_inline_radio(workflow_handle, workflow_items, UI_ALIGN_LEFT);
if (workflow_handle->changed) {
paint/sources/ui/ui_view2d.c
+1 -1
View File
@@ -85,7 +85,7 @@ void ui_view2d_draw_edit() {
h_view2d_grid_snap->b = g_config->view2d_grid_snap;
g_config->view2d_grid_snap = ui_check(h_view2d_grid_snap, tr("Grid Snap"), any_map_get(g_keymap, "grid_snap"));
if (h_view2d_grid_snap->changed) {
ui_menu_keep_open = true;
ui_menu_keep_open = true;
}
ui_menu_separator();