diff options
Diffstat (limited to 'source/blender/editors/space_node/drawnode.c')
| -rw-r--r-- | source/blender/editors/space_node/drawnode.c | 60 |
1 files changed, 3 insertions, 57 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 9db89ec1ba2..16bbca2a0c3 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -748,6 +748,7 @@ static void node_shader_buts_vect_transform(uiLayout *layout, bContext *UNUSED(C static void node_shader_buts_attribute(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { + uiItemR(layout, ptr, "attribute_type", DEFAULT_FLAGS, IFACE_("Type"), ICON_NONE); uiItemR(layout, ptr, "attribute_name", DEFAULT_FLAGS, IFACE_("Name"), ICON_NONE); } @@ -2369,7 +2370,7 @@ static void node_composit_buts_bokehimage(uiLayout *layout, bContext *UNUSED(C), static void node_composit_buts_bokehblur(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { uiItemR(layout, ptr, "use_variable_size", DEFAULT_FLAGS, NULL, ICON_NONE); - // uiItemR(layout, ptr, "f_stop", DEFAULT_FLAGS, NULL, ICON_NONE); // UNUSED + // uiItemR(layout, ptr, "f_stop", DEFAULT_FLAGS, NULL, ICON_NONE); /* UNUSED */ uiItemR(layout, ptr, "blur_max", DEFAULT_FLAGS, NULL, ICON_NONE); uiItemR(layout, ptr, "use_extended_bounds", DEFAULT_FLAGS, NULL, ICON_NONE); } @@ -3140,58 +3141,8 @@ static void node_texture_set_butfunc(bNodeType *ntype) /* ****************** BUTTON CALLBACKS FOR SIMULATION NODES ***************** */ -static void node_simulation_buts_particle_simulation(uiLayout *layout, - bContext *UNUSED(C), - PointerRNA *ptr) +static void node_simulation_set_butfunc(bNodeType *UNUSED(ntype)) { - uiItemR(layout, ptr, "name", DEFAULT_FLAGS, "", ICON_NONE); -} - -static void node_simulation_buts_particle_time_step_event(uiLayout *layout, - bContext *UNUSED(C), - PointerRNA *ptr) -{ - uiItemR(layout, ptr, "mode", DEFAULT_FLAGS, "", ICON_NONE); -} - -static void node_simulation_buts_particle_attribute(uiLayout *layout, - bContext *UNUSED(C), - PointerRNA *ptr) -{ - uiItemR(layout, ptr, "data_type", DEFAULT_FLAGS, "", ICON_NONE); -} - -static void node_simulation_buts_set_particle_attribute(uiLayout *layout, - bContext *UNUSED(C), - PointerRNA *ptr) -{ - uiItemR(layout, ptr, "data_type", DEFAULT_FLAGS, "", ICON_NONE); -} - -static void node_simulation_buts_time(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) -{ - uiItemR(layout, ptr, "mode", DEFAULT_FLAGS, "", ICON_NONE); -} - -static void node_simulation_set_butfunc(bNodeType *ntype) -{ - switch (ntype->type) { - case SIM_NODE_PARTICLE_SIMULATION: - ntype->draw_buttons = node_simulation_buts_particle_simulation; - break; - case SIM_NODE_PARTICLE_TIME_STEP_EVENT: - ntype->draw_buttons = node_simulation_buts_particle_time_step_event; - break; - case SIM_NODE_PARTICLE_ATTRIBUTE: - ntype->draw_buttons = node_simulation_buts_particle_attribute; - break; - case SIM_NODE_SET_PARTICLE_ATTRIBUTE: - ntype->draw_buttons = node_simulation_buts_set_particle_attribute; - break; - case SIM_NODE_TIME: - ntype->draw_buttons = node_simulation_buts_time; - break; - } } /* ****************** BUTTON CALLBACKS FOR FUNCTION NODES ***************** */ @@ -3379,10 +3330,6 @@ static const float std_node_socket_colors[][4] = { {0.39, 0.39, 0.39, 1.0}, /* SOCK_STRING */ {0.40, 0.10, 0.10, 1.0}, /* SOCK_OBJECT */ {0.10, 0.40, 0.10, 1.0}, /* SOCK_IMAGE */ - {0.80, 0.80, 0.20, 1.0}, /* SOCK_EMITTERS */ - {0.80, 0.20, 0.80, 1.0}, /* SOCK_EVENTS */ - {0.20, 0.80, 0.80, 1.0}, /* SOCK_FORCES */ - {0.30, 0.30, 0.30, 1.0}, /* SOCK_CONTROL_FLOW */ }; /* common color callbacks for standard types */ @@ -4128,7 +4075,6 @@ void node_draw_link(View2D *v2d, SpaceNode *snode, bNodeLink *link) } node_draw_link_bezier(v2d, snode, link, th_col1, th_col2, th_col3); - // node_draw_link_straight(v2d, snode, link, th_col1, do_shaded, th_col2, do_triple, th_col3); } void ED_node_draw_snap(View2D *v2d, const float cent[2], float size, NodeBorder border, uint pos) |