Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_node / node_templates.c
index bba21f7f5ebf8ffaff5b6c954fe8ec8b548cef45..23fd793cdd31938cda681fd0acc54627d94db310 100644 (file)
@@ -449,10 +449,7 @@ static void ui_node_menu_column(NodeLinkArg *arg, int nclass, const char *cname)
        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;
+               compatibility = NODE_NEW_SHADING;
        }
 
        /* generate array of node types sorted by UI name */
@@ -638,7 +635,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 +678,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 +703,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);