diff options
Diffstat (limited to 'source/blender/editors/space_node/node_templates.c')
-rw-r--r-- | source/blender/editors/space_node/node_templates.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/source/blender/editors/space_node/node_templates.c b/source/blender/editors/space_node/node_templates.c index ef9ead3407c..8667056a687 100644 --- a/source/blender/editors/space_node/node_templates.c +++ b/source/blender/editors/space_node/node_templates.c @@ -446,21 +446,13 @@ static void ui_node_menu_column(NodeLinkArg *arg, int nclass, const char *cname) uiBut *but; NodeLinkArg *argN; int first = 1; - int compatibility = 0; - - if (ntree->type == NTREE_SHADER) { - if (BKE_scene_use_new_shading_nodes(arg->scene)) - compatibility = NODE_NEW_SHADING; - else - compatibility = NODE_OLD_SHADING; - } /* generate array of node types sorted by UI name */ bNodeType **sorted_ntypes = NULL; BLI_array_declare(sorted_ntypes); NODE_TYPES_BEGIN(ntype) { - if (compatibility && !(ntype->compatibility & compatibility)) { + if (!(ntype->poll && ntype->poll(ntype, ntree))) { continue; } @@ -638,7 +630,7 @@ static void ui_node_draw_node(uiLayout *layout, bContext *C, bNodeTree *ntree, b if (node->typeinfo->draw_buttons) { if (node->type != NODE_GROUP) { - split = uiLayoutSplit(layout, 0.35f, false); + split = uiLayoutSplit(layout, 0.5f, false); col = uiLayoutColumn(split, false); col = uiLayoutColumn(split, false); @@ -681,10 +673,10 @@ static void ui_node_draw_input(uiLayout *layout, bContext *C, bNodeTree *ntree, label[i] = ' '; } label[indent] = '\0'; - BLI_snprintf(label + indent, UI_MAX_NAME_STR - indent, "%s:", IFACE_(input->name)); + BLI_snprintf(label + indent, UI_MAX_NAME_STR - indent, "%s", IFACE_(input->name)); /* split in label and value */ - split = uiLayoutSplit(layout, 0.35f, false); + split = uiLayoutSplit(layout, 0.5f, false); row = uiLayoutRow(split, true); @@ -706,7 +698,7 @@ static void ui_node_draw_input(uiLayout *layout, bContext *C, bNodeTree *ntree, uiItemL(row, label, ICON_NONE); bt = block->buttons.last; - bt->drawflag = UI_BUT_TEXT_LEFT; + bt->drawflag = UI_BUT_TEXT_RIGHT; if (dependency_loop) { row = uiLayoutRow(split, false); |