diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-03-12 04:24:15 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-12 04:34:54 +0300 |
commit | 1aebcdbb3a75b8c59ea211bb1ea6cc8573b0ea0f (patch) | |
tree | d4bff59a4d7e46fc333078bebe6bdd9ffcca6d0f /source/blender/editors | |
parent | 74855969e7b5fd8da71cc62057a0ce8eb3f528f8 (diff) |
Cleanup: spelling, clang-format
Diffstat (limited to 'source/blender/editors')
4 files changed, 24 insertions, 22 deletions
diff --git a/source/blender/editors/gpencil/gpencil_sculpt_paint.c b/source/blender/editors/gpencil/gpencil_sculpt_paint.c index 33b08d90751..5db331280f8 100644 --- a/source/blender/editors/gpencil/gpencil_sculpt_paint.c +++ b/source/blender/editors/gpencil/gpencil_sculpt_paint.c @@ -1744,7 +1744,8 @@ static bool gpsculpt_brush_apply_standard(bContext *C, tGP_BrushEditData *gso) if ((gpf == gpl->actframe) || (gpf->flag & GP_FRAME_SELECT)) { /* compute multiframe falloff factor */ if (gso->use_multiframe_falloff) { - /* Faloff depends on distance to active frame (relative to the overall frame range) */ + /* Falloff depends on distance to active frame + * (relative to the overall frame range). */ gso->mf_falloff = BKE_gpencil_multiframe_falloff_calc( gpf, gpl->actframe->framenum, f_init, f_end, ts->gp_sculpt.cur_falloff); } diff --git a/source/blender/editors/gpencil/gpencil_weight_paint.c b/source/blender/editors/gpencil/gpencil_weight_paint.c index 6b337afa559..c519129cdf7 100644 --- a/source/blender/editors/gpencil/gpencil_weight_paint.c +++ b/source/blender/editors/gpencil/gpencil_weight_paint.c @@ -110,7 +110,7 @@ typedef struct tGP_BrushWeightpaintData { /* Start of new paint */ bool first; - /* Is multiframe editing enabled, and are we using falloff for that? */ + /* Is multi-frame editing enabled, and are we using falloff for that? */ bool is_multiframe; bool use_multiframe_falloff; @@ -127,10 +127,10 @@ typedef struct tGP_BrushWeightpaintData { /* - Effect 2D vector */ float dvec[2]; - /* - multiframe falloff factor */ + /* - multi-frame falloff factor. */ float mf_falloff; - /* brush geometry (bounding box) */ + /* brush geometry (bounding box). */ rcti brush_rect; /* Temp data to save selected points */ @@ -206,7 +206,7 @@ static float brush_influence_calc(tGP_BrushWeightpaintData *gso, const int radiu float brush_fallof = BKE_brush_curve_strength(brush, distance, (float)radius); influence *= brush_fallof; - /* apply multiframe falloff */ + /* apply multi-frame falloff */ influence *= gso->mf_falloff; /* return influence */ @@ -585,7 +585,7 @@ static bool gp_weightpaint_brush_apply_to_layers(bContext *C, tGP_BrushWeightpai /* Active Frame or MultiFrame? */ if (gso->is_multiframe) { - /* init multiframe falloff options */ + /* init multi-frame falloff options */ int f_init = 0; int f_end = 0; @@ -596,10 +596,10 @@ static bool gp_weightpaint_brush_apply_to_layers(bContext *C, tGP_BrushWeightpai LISTBASE_FOREACH (bGPDframe *, gpf, &gpl->frames) { /* Always do active frame; Otherwise, only include selected frames */ if ((gpf == gpl->actframe) || (gpf->flag & GP_FRAME_SELECT)) { - /* compute multiframe falloff factor */ + /* Compute multi-frame falloff factor. */ if (gso->use_multiframe_falloff) { - /* Faloff depends on distance to active frame (relative to the overall frame range) - */ + /* Falloff depends on distance to active frame + * (relative to the overall frame range). */ gso->mf_falloff = BKE_gpencil_multiframe_falloff_calc( gpf, gpl->actframe->framenum, f_init, f_end, ts->gp_sculpt.cur_falloff); } @@ -656,7 +656,7 @@ static void gp_weightpaint_brush_apply(bContext *C, wmOperator *op, PointerRNA * gso->brush_rect.xmax = mouse[0] + radius; gso->brush_rect.ymax = mouse[1] + radius; - /* Calc 2D direction vector and relative angle. */ + /* Calculate 2D direction vector and relative angle. */ brush_calc_dvec_2d(gso); changed = gp_weightpaint_brush_apply_to_layers(C, gso); diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index bd92193206f..bfbc9b6825b 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -1987,7 +1987,7 @@ static bool ed_object_select_pick(bContext *C, is_obedit = (vc.obedit != NULL); if (object) { - /* signal for view3d_opengl_select to skip editmode objects */ + /* Signal for #view3d_opengl_select to skip edit-mode objects. */ vc.obedit = NULL; } @@ -2003,7 +2003,7 @@ static bool ed_object_select_pick(bContext *C, /* This block uses the control key to make the object selected * by its center point rather than its contents */ - /* in editmode do not activate */ + /* In edit-mode do not activate. */ if (obcenter) { /* note; shift+alt goes to group-flush-selecting */ @@ -2337,11 +2337,11 @@ static int view3d_select_exec(bContext *C, wmOperator *op) bool toggle = RNA_boolean_get(op->ptr, "toggle"); bool center = RNA_boolean_get(op->ptr, "center"); bool enumerate = RNA_boolean_get(op->ptr, "enumerate"); - /* only force object select for editmode to support vertex parenting, - * or paint-select to allow pose bone select with vert/face select */ + /* Only force object select for edit-mode to support vertex parenting, + * or paint-select to allow pose bone select with vert/face select. */ bool object = (RNA_boolean_get(op->ptr, "object") && (obedit || BKE_paint_select_elem_test(obact) || - /* so its possible to select bones in weightpaint mode (LMB select) */ + /* so its possible to select bones in weight-paint mode (LMB select) */ (obact && (obact->mode & OB_MODE_WEIGHT_PAINT) && BKE_object_pose_armature_get(obact)))); @@ -2358,8 +2358,8 @@ static int view3d_select_exec(bContext *C, wmOperator *op) obact = NULL; /* ack, this is incorrect but to do this correctly we would need an - * alternative editmode/objectmode keymap, this copies the functionality - * from 2.4x where Ctrl+Select in editmode does object select only */ + * alternative edit-mode/object-mode keymap, this copies the functionality + * from 2.4x where Ctrl+Select in edit-mode does object select only. */ center = false; } @@ -2493,12 +2493,12 @@ void VIEW3D_OT_select(wmOperatorType *ot) "center", 0, "Center", - "Use the object center when selecting, in editmode used to extend object selection"); + "Use the object center when selecting, in edit-mode used to extend object selection"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); prop = RNA_def_boolean( ot->srna, "enumerate", 0, "Enumerate", "List objects under the mouse (object mode only)"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); - prop = RNA_def_boolean(ot->srna, "object", 0, "Object", "Use object selection (editmode only)"); + prop = RNA_def_boolean(ot->srna, "object", 0, "Object", "Use object selection (edit-mode only)"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); prop = RNA_def_int_vector(ot->srna, @@ -3286,7 +3286,7 @@ static int view3d_box_select_exec(bContext *C, wmOperator *op) } FOREACH_OBJECT_IN_MODE_END; } - else { /* no editmode, unified for bones and objects */ + else { /* No edit-mode, unified for bones and objects. */ if (vc.obact && vc.obact->mode & OB_MODE_SCULPT) { /* XXX, this is not selection, could be it's own operator. */ changed_multi = ED_sculpt_mask_box_select( diff --git a/source/blender/editors/transform/transform_convert_gpencil.c b/source/blender/editors/transform/transform_convert_gpencil.c index 17e69ff38b8..efd7879c8b2 100644 --- a/source/blender/editors/transform/transform_convert_gpencil.c +++ b/source/blender/editors/transform/transform_convert_gpencil.c @@ -228,10 +228,11 @@ void createTransGPencil(bContext *C, TransInfo *t) for (gpf = init_gpf; gpf; gpf = gpf->next) { if ((gpf == gpl->actframe) || ((gpf->flag & GP_FRAME_SELECT) && (is_multiedit))) { - /* if multiframe and falloff, recalculate and save value */ + /* If multi-frame and falloff, recalculate and save value. */ float falloff = 1.0f; /* by default no falloff */ if ((is_multiedit) && (use_multiframe_falloff)) { - /* Faloff depends on distance to active frame (relative to the overall frame range) */ + /* Falloff depends on distance to active frame + * (relative to the overall frame range). */ falloff = BKE_gpencil_multiframe_falloff_calc( gpf, gpl->actframe->framenum, f_init, f_end, ts->gp_sculpt.cur_falloff); } |