diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-08-23 02:03:57 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-08-23 02:09:38 +0300 |
commit | adfb9ec87cebafe61e8870c5dfd7593d32e9eb0a (patch) | |
tree | 1cc57a24b047bfb152fe458ec3594f6b8de28cef /source/blender/editors | |
parent | 1de7717ed711c53755a2f1393ab103fd98bf6b32 (diff) |
Cleanup: const args, naming, doxy groups, clang-format
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_draw.c | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 9f0dc38750d..0fccfd19795 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -1118,6 +1118,8 @@ static void SCREEN_OT_actionzone(wmOperatorType *ot) RNA_def_int(ot->srna, "modifier", 0, 0, 2, "Modifier", "Modifier state", 0, 2); } +/** \} */ + /* -------------------------------------------------------------------- */ /** \name Area edge detection utility * \{ */ @@ -1157,6 +1159,8 @@ static ScrEdge *screen_area_edge_from_cursor(const bContext *C, return actedge; } +/** \} */ + /* -------------------------------------------------------------------- */ /** \name Swap Area Operator * \{ */ diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index 91fc5ca5045..642f90407fe 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -779,7 +779,7 @@ static void node_socket_draw(const bContext *C, immAttr4fv(col_id, color); immAttr1u(shape_id, flags); - immAttr1f(size_id, size); + immAttr1f(size_id, size); immAttr4fv(outline_col_id, outline_color); immVertex2f(pos_id, sock->locx, sock->locy); } @@ -944,7 +944,8 @@ void node_draw_sockets(View2D *v2d, uint col_id = GPU_vertformat_attr_add(format, "color", GPU_COMP_F32, 4, GPU_FETCH_FLOAT); uint shape_id = GPU_vertformat_attr_add(format, "flags", GPU_COMP_U32, 1, GPU_FETCH_INT); uint size_id = GPU_vertformat_attr_add(format, "size", GPU_COMP_F32, 1, GPU_FETCH_FLOAT); - uint outline_col_id = GPU_vertformat_attr_add(format, "outlineColor", GPU_COMP_F32, 4, GPU_FETCH_FLOAT); + uint outline_col_id = GPU_vertformat_attr_add( + format, "outlineColor", GPU_COMP_F32, 4, GPU_FETCH_FLOAT); GPU_blend(true); GPU_program_point_size(true); @@ -1018,7 +1019,7 @@ void node_draw_sockets(View2D *v2d, /* go back and draw selected sockets */ if (selected_input_len + selected_output_len > 0) { /* outline for selected sockets */ - + selected = true; immBegin(GPU_PRIM_POINTS, selected_input_len + selected_output_len); |