blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 778 Projects 19 Wiki Activity

UI: Use single column layout on Tangent node #113902

Merged
Pablo Vazquez merged 2 commits from pablovazquez/blender:ui-node-tangent-layout into main 2023-10-18 18:37:33 +02:00
Conversation 0 Commits 2 Files Changed 1 +5 -10
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/nodes/shader/nodes/node_shader_tangent.cc
View File

@ -23,13 +23,7 @@ static void node_declare(NodeDeclarationBuilder &b)
static void node_shader_buts_tangent(uiLayout *layout, bContext *C, PointerRNA *ptr)
{
uiLayout *split, *row;
split = uiLayoutSplit(layout, 0.0f, false);
uiItemR(split, ptr, "direction_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE);
row = uiLayoutRow(split, false);
uiItemR(layout, ptr, "direction_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE);
if (RNA_enum_get(ptr, "direction_type") == SHD_TANGENT_UVMAP) {
PointerRNA obptr = CTX_data_pointer_get(C, "active_object");
@ -40,14 +34,15 @@ static void node_shader_buts_tangent(uiLayout *layout, bContext *C, PointerRNA *
Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
DEG_get_evaluated_rna_pointer(depsgraph, &obptr, &eval_obptr);
PointerRNA dataptr = RNA_pointer_get(&eval_obptr, "data");
uiItemPointerR(row, ptr, "uv_map", &dataptr, "uv_layers", "", ICON_GROUP_UVS);
uiItemPointerR(layout, ptr, "uv_map", &dataptr, "uv_layers", "", ICON_GROUP_UVS);
}
else {
uiItemR(row, ptr, "uv_map", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE);
uiItemR(layout, ptr, "uv_map", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_GROUP_UVS);
}
}
else {
uiItemR(row, ptr, "axis", UI_ITEM_R_SPLIT_EMPTY_NAME | UI_ITEM_R_EXPAND, nullptr, ICON_NONE);
uiItemR(
layout, ptr, "axis", UI_ITEM_R_SPLIT_EMPTY_NAME | UI_ITEM_R_EXPAND, nullptr, ICON_NONE);
}
}
pablovazquez marked this conversation as resolved Outdated
Hans Goudey commented 2023-10-18 18:34:40 +02:00
Outdated
Review
Copy Link

This is a general problem with nodes drawing, best to not just fix it for this one node.

This is a general problem with nodes drawing, best to not just fix it for this one node.
👍 1