diff options
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/armature/pose_lib.c | 10 | ||||
-rw-r--r-- | source/blender/editors/include/UI_interface.h | 7 | ||||
-rw-r--r-- | source/blender/editors/interface/interface.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 10 | ||||
-rw-r--r-- | source/blender/editors/interface/view2d_ops.c | 6 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 6 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_nla/nla_buttons.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 4 |
9 files changed, 27 insertions, 26 deletions
diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c index 9d70f8877c6..6ce9ed06f1a 100644 --- a/source/blender/editors/armature/pose_lib.c +++ b/source/blender/editors/armature/pose_lib.c @@ -87,12 +87,12 @@ static void action_set_activemarker(void *UNUSED(a), void *UNUSED(b), void *UNUS * It acts as a kind of "glorified clipboard for poses", allowing for naming of poses. * * Features: - * - PoseLibs are simply normal Actions. - * - Each "pose" is simply a set of keyframes that occur on a particular frame. - * - A set of TimeMarkers that belong to each Action, help 'label' where a 'pose' can be + * - Pose-libs are simply normal Actions. + * - Each "pose" is simply a set of key-frames that occur on a particular frame. + * - A set of #TimeMarker that belong to each Action, help 'label' where a 'pose' can be * found in the Action. - * - The Scrollwheel or PageUp/Down buttons when used in a special mode or after pressing/holding - * [a modifier] key, cycles through the poses available for the active pose's poselib, + * - The Scroll-wheel or PageUp/Down buttons when used in a special mode or after pressing/holding + * [a modifier] key, cycles through the poses available for the active pose's pose-lib, * allowing the animator to preview what action best suits that pose. */ /* ************************************************************* */ diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 7fd45e06fbf..d93e8809ed2 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -293,12 +293,13 @@ enum { /* 16 to copy ICON_DEFAULT_HEIGHT */ #define UI_DPI_ICON_SIZE ((float)16 * UI_DPI_FAC) -/* Button types, bits stored in 1 value... and a short even! - * - bits 0-4: bitnr (0-31) +/** + * Button types, bits stored in 1 value... and a short even! + * - bits 0-4: #uiBut.bitnr (0-31) * - bits 5-7: pointer type * - bit 8: for 'bit' * - bit 9-15: button type (now 6 bits, 64 types) - * */ + */ typedef enum { UI_BUT_POIN_CHAR = 32, UI_BUT_POIN_SHORT = 64, diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 6c1f9d4f017..9f6c6fff680 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -737,8 +737,8 @@ static bool ui_but_update_from_old_block(const bContext *C, #else BLI_assert(*but_old_p == NULL || BLI_findindex(&oldblock->buttons, *but_old_p) != -1); - /* fastpath - avoid loop-in-loop, calling 'ui_but_find_old' - * as long as old/new buttons are aligned */ + /* Fast-path - avoid loop-in-loop, calling #ui_but_find_old + * as long as old/new buttons are aligned. */ if (LIKELY(*but_old_p && ui_but_equals_old(but, *but_old_p))) { oldbut = *but_old_p; } diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index ccbbaf40992..bad833265d9 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -8935,11 +8935,11 @@ static int ui_handle_list_event(bContext *C, const wmEvent *event, ARegion *regi my = event->y; ui_window_to_block(region, listbox->block, &mx, &my); - /* convert pan to scrollwheel */ + /* Convert pan to scroll-wheel. */ if (type == MOUSEPAN) { ui_pan_to_scroll(event, &type, &val); - /* if type still is mousepan, we call it handled, since delta-y accumulate */ + /* If type still is mouse-pan, we call it handled, since delta-y accumulate. */ /* also see wm_event_system.c do_wheel_ui hack */ if (type == MOUSEPAN) { retval = WM_UI_HANDLER_BREAK; @@ -9666,7 +9666,7 @@ static int ui_handle_menu_event(bContext *C, int type = event->type; int val = event->val; - /* convert pan to scrollwheel */ + /* Convert pan to scroll-wheel. */ if (type == MOUSEPAN) { ui_pan_to_scroll(event, &type, &val); } @@ -9691,7 +9691,7 @@ static int ui_handle_menu_event(bContext *C, case EVT_PAGEDOWNKEY: case EVT_HOMEKEY: case EVT_ENDKEY: - /* arrowkeys: only handle for block_loop blocks */ + /* Arrow-keys: only handle for block_loop blocks. */ if (IS_EVENT_MOD(event, shift, ctrl, alt, oskey)) { /* pass */ } @@ -9699,7 +9699,7 @@ static int ui_handle_menu_event(bContext *C, int type = event->type; int val = event->val; - /* convert pan to scrollwheel */ + /* Convert pan to scroll-wheel. */ if (type == MOUSEPAN) { ui_pan_to_scroll(event, &type, &val); } diff --git a/source/blender/editors/interface/view2d_ops.c b/source/blender/editors/interface/view2d_ops.c index a2c83c24e96..c37a7279773 100644 --- a/source/blender/editors/interface/view2d_ops.c +++ b/source/blender/editors/interface/view2d_ops.c @@ -68,7 +68,7 @@ static bool view2d_poll(bContext *C) /** * This group of operators come in several forms: * -# Modal 'dragging' with MMB - where movement of mouse dictates amount to pan view by - * -# Scrollwheel 'steps' - rolling mousewheel by one step moves view by predefined amount + * -# Scroll-wheel 'steps' - rolling mouse-wheel by one step moves view by predefined amount * * In order to make sure this works, each operator must define the following RNA-Operator Props: * - `deltax, deltay` - define how much to move view by (relative to zoom-correction factor) @@ -738,8 +738,8 @@ static void VIEW2D_OT_scroll_up(wmOperatorType *ot) /** * This group of operators come in several forms: - * -# Scrollwheel 'steps' - rolling mousewheel by one step zooms view by predefined amount. - * -# Scrollwheel 'steps' + alt + ctrl/shift - zooms view on one axis only (ctrl=x, shift=y). + * -# Scroll-wheel 'steps' - rolling mouse-wheel by one step zooms view by predefined amount. + * -# Scroll-wheel 'steps' + alt + ctrl/shift - zooms view on one axis only (ctrl=x, shift=y). * XXX this could be implemented... * -# Pad +/- Keys - pressing each key moves the zooms the view by a predefined amount. * diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 83620b4bc56..32fa7a1871c 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -1426,7 +1426,7 @@ static void insert_seam_vert_array(const ProjPaintState *ps, * Be tricky with flags, first 4 bits are #PROJ_FACE_SEAM0 to 4, * last 4 bits are #PROJ_FACE_NOSEAM0 to 4. `1 << i` - where i is `(0..3)`. * - * If we're multithreadng, make sure threads are locked when this is called. + * If we're multi-threadng, make sure threads are locked when this is called. */ static void project_face_seams_init(const ProjPaintState *ps, MemArena *arena, @@ -3566,8 +3566,8 @@ static bool project_bucket_face_isect(ProjPaintState *ps, int bucket_y, const MLoopTri *lt) { - /* TODO - replace this with a tricker method that uses sideofline for all - * screenCoords's edges against the closest bucket corner */ + /* TODO - replace this with a trickier method that uses side-of-line for all + * #ProjPaintState.screenCoords edges against the closest bucket corner. */ const int lt_vtri[3] = {PS_LOOPTRI_AS_VERT_INDEX_3(ps, lt)}; rctf bucket_bounds; float p1[2], p2[2], p3[2], p4[2]; diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 6d83e88b556..2f8d17055f4 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -8209,7 +8209,7 @@ static void SCULPT_OT_sample_color(wmOperatorType *ot) /* This allows the sculpt tools to work on meshes with multiple connected components as they had * only one connected component. When initialized and enabled, the sculpt API will return extra * connectivity neighbors that are not in the real mesh. These neighbors are calculated for each - * vertex using the minimun distance to a vertex that is in a different connected component. */ + * vertex using the minimum distance to a vertex that is in a different connected component. */ /* The fake neighbors first need to be ensured to be initialized. * After that tools which needs fake neighbors functionality need to @@ -8224,7 +8224,7 @@ static void SCULPT_OT_sample_color(wmOperatorType *ot) * } * * Such approach allows to keep all the connectivity information ready for reuse - * (withouy having lag prior to every stroke), but also makes it so the affect + * (without having lag prior to every stroke), but also makes it so the affect * is localized to a specific brushes and tools only. */ enum { diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index d0d9f2f57bb..130167f1bd0 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -392,7 +392,7 @@ static void nla_panel_properties(const bContext *C, Panel *panel) uiItemR(column, &strip_ptr, "blend_type", 0, NULL, ICON_NONE); /* Blend in/out + auto-blending: - * - blend in/out can only be set when autoblending is off + * - blend in/out can only be set when auto-blending is off. */ uiItemS(layout); diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 33625a8b775..fab98857c99 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -509,8 +509,8 @@ static void viewops_data_create(bContext *C, negate_v3_v3(my_origin, rv3d->ofs); /* ofs is flipped */ - /* Set the dist value to be the distance from this 3d point this means youll - * always be able to zoom into it and panning wont go bad when dist was zero */ + /* Set the dist value to be the distance from this 3d point this means you'll + * always be able to zoom into it and panning wont go bad when dist was zero. */ /* remove dist value */ upvec[0] = upvec[1] = 0; |