diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-15 00:53:22 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-15 01:54:30 +0300 |
commit | 35b78d9807c49ba37e038eda85c672c72dee0247 (patch) | |
tree | a081042c85b98d0ac9116c0c4ba99ded6ae5de84 /source/blender/editors | |
parent | 395a0acdb88338b9790ecefd142f4010df6b955d (diff) |
Cleanup: indentation, wrapping
Mostly functions wrapping args, not confirming to our style guide.
Diffstat (limited to 'source/blender/editors')
34 files changed, 333 insertions, 294 deletions
diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index acffbd56b18..558c5d5bfc1 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -1258,8 +1258,9 @@ static void rearrange_nla_control_channels(bAnimContext *ac, AnimData *adt, eRea /* we cannot rearrange between strips, but within each strip, we can rearrange those curves */ for (nlt = adt->nla_tracks.first; nlt; nlt = nlt->next) { for (strip = nlt->strips.first; strip; strip = strip->next) { - rearrange_animchannel_islands(&strip->fcurves, rearrange_func, mode, ANIMTYPE_NLACURVE, - &anim_data_visible); + rearrange_animchannel_islands( + &strip->fcurves, rearrange_func, mode, ANIMTYPE_NLACURVE, + &anim_data_visible); } } diff --git a/source/blender/editors/animation/anim_filter.c b/source/blender/editors/animation/anim_filter.c index af2037ef376..17d74e8324f 100644 --- a/source/blender/editors/animation/anim_filter.c +++ b/source/blender/editors/animation/anim_filter.c @@ -1418,10 +1418,11 @@ static size_t animfilter_nla(bAnimContext *UNUSED(ac), ListBase *anim_data, bDop * - as AnimData may not have an action, we pass a dummy pointer just to get the list elem created, then * overwrite this with the real value - REVIEW THIS... */ - ANIMCHANNEL_NEW_CHANNEL_FULL((void *)(&adt->action), ANIMTYPE_NLAACTION, owner_id, NULL, - { - ale->data = adt->action ? adt->action : NULL; - }); + ANIMCHANNEL_NEW_CHANNEL_FULL( + (void *)(&adt->action), ANIMTYPE_NLAACTION, owner_id, NULL, + { + ale->data = adt->action ? adt->action : NULL; + }); } } @@ -1551,26 +1552,27 @@ static size_t animfilter_block_data(bAnimContext *ac, ListBase *anim_data, bDope * in a few places in the rest of the code still - notably for the few cases where special mode-based * different types of data expanders are required. */ - ANIMDATA_FILTER_CASES(iat, - { /* AnimData */ - /* specifically filter animdata block */ - if (ANIMCHANNEL_SELOK(SEL_ANIMDATA(adt)) ) { - ANIMCHANNEL_NEW_CHANNEL(adt, ANIMTYPE_ANIMDATA, id, NULL); - } - }, - { /* NLA */ - items += animfilter_nla(ac, anim_data, ads, adt, filter_mode, id); - }, - { /* Drivers */ - items += animfilter_fcurves(anim_data, ads, adt->drivers.first, ANIMTYPE_FCURVE, - filter_mode, NULL, id, id); - }, - { /* NLA Control Keyframes */ - items += animfilter_nla_controls(anim_data, ads, adt, filter_mode, id); - }, - { /* Keyframes */ - items += animfilter_action(ac, anim_data, ads, adt->action, filter_mode, id); - } + ANIMDATA_FILTER_CASES( + iat, + { /* AnimData */ + /* specifically filter animdata block */ + if (ANIMCHANNEL_SELOK(SEL_ANIMDATA(adt)) ) { + ANIMCHANNEL_NEW_CHANNEL(adt, ANIMTYPE_ANIMDATA, id, NULL); + } + }, + { /* NLA */ + items += animfilter_nla(ac, anim_data, ads, adt, filter_mode, id); + }, + { /* Drivers */ + items += animfilter_fcurves(anim_data, ads, adt->drivers.first, ANIMTYPE_FCURVE, + filter_mode, NULL, id, id); + }, + { /* NLA Control Keyframes */ + items += animfilter_nla_controls(anim_data, ads, adt, filter_mode, id); + }, + { /* Keyframes */ + items += animfilter_action(ac, anim_data, ads, adt->action, filter_mode, id); + } ); } @@ -2531,20 +2533,21 @@ static size_t animdata_filter_ds_obanim(bAnimContext *ac, ListBase *anim_data, b /* determine the type of expander channels to use */ /* this is the best way to do this for now... */ - ANIMDATA_FILTER_CASES(ob, - { /* AnimData - no channel, but consider data */ }, - { /* NLA - no channel, but consider data */ }, - { /* Drivers */ - type = ANIMTYPE_FILLDRIVERS; - cdata = adt; - expanded = EXPANDED_DRVD(adt); - }, - { /* NLA Strip Controls - no dedicated channel for now (XXX) */ }, - { /* Keyframes */ - type = ANIMTYPE_FILLACTD; - cdata = adt->action; - expanded = EXPANDED_ACTC(adt->action); - }); + ANIMDATA_FILTER_CASES( + ob, + { /* AnimData - no channel, but consider data */ }, + { /* NLA - no channel, but consider data */ }, + { /* Drivers */ + type = ANIMTYPE_FILLDRIVERS; + cdata = adt; + expanded = EXPANDED_DRVD(adt); + }, + { /* NLA Strip Controls - no dedicated channel for now (XXX) */ }, + { /* Keyframes */ + type = ANIMTYPE_FILLACTD; + cdata = adt->action; + expanded = EXPANDED_ACTC(adt->action); + }); /* add object-level animation channels */ BEGIN_ANIMFILTER_SUBCHANNELS(expanded) @@ -2701,20 +2704,21 @@ static size_t animdata_filter_ds_scene(bAnimContext *ac, ListBase *anim_data, bD /* determine the type of expander channels to use */ // this is the best way to do this for now... - ANIMDATA_FILTER_CASES(sce, - { /* AnimData - no channel, but consider data */}, - { /* NLA - no channel, but consider data */}, - { /* Drivers */ - type = ANIMTYPE_FILLDRIVERS; - cdata = adt; - expanded = EXPANDED_DRVD(adt); - }, - { /* NLA Strip Controls - no dedicated channel for now (XXX) */ }, - { /* Keyframes */ - type = ANIMTYPE_FILLACTD; - cdata = adt->action; - expanded = EXPANDED_ACTC(adt->action); - }); + ANIMDATA_FILTER_CASES( + sce, + { /* AnimData - no channel, but consider data */}, + { /* NLA - no channel, but consider data */}, + { /* Drivers */ + type = ANIMTYPE_FILLDRIVERS; + cdata = adt; + expanded = EXPANDED_DRVD(adt); + }, + { /* NLA Strip Controls - no dedicated channel for now (XXX) */ }, + { /* Keyframes */ + type = ANIMTYPE_FILLACTD; + cdata = adt->action; + expanded = EXPANDED_ACTC(adt->action); + }); /* add scene-level animation channels */ BEGIN_ANIMFILTER_SUBCHANNELS(expanded) diff --git a/source/blender/editors/armature/pose_slide.c b/source/blender/editors/armature/pose_slide.c index 769398e9e0c..1d3fd1ea8c6 100644 --- a/source/blender/editors/armature/pose_slide.c +++ b/source/blender/editors/armature/pose_slide.c @@ -1645,19 +1645,19 @@ void POSE_OT_propagate(wmOperatorType *ot) { static const EnumPropertyItem terminate_items[] = { {POSE_PROPAGATE_SMART_HOLDS, "WHILE_HELD", 0, "While Held", - "Propagate pose to all keyframes after current frame that don't change (Default behavior)"}, + "Propagate pose to all keyframes after current frame that don't change (Default behavior)"}, {POSE_PROPAGATE_NEXT_KEY, "NEXT_KEY", 0, "To Next Keyframe", - "Propagate pose to first keyframe following the current frame only"}, + "Propagate pose to first keyframe following the current frame only"}, {POSE_PROPAGATE_LAST_KEY, "LAST_KEY", 0, "To Last Keyframe", - "Propagate pose to the last keyframe only (i.e. making action cyclic)"}, + "Propagate pose to the last keyframe only (i.e. making action cyclic)"}, {POSE_PROPAGATE_BEFORE_FRAME, "BEFORE_FRAME", 0, "Before Frame", - "Propagate pose to all keyframes between current frame and 'Frame' property"}, + "Propagate pose to all keyframes between current frame and 'Frame' property"}, {POSE_PROPAGATE_BEFORE_END, "BEFORE_END", 0, "Before Last Keyframe", - "Propagate pose to all keyframes from current frame until no more are found"}, + "Propagate pose to all keyframes from current frame until no more are found"}, {POSE_PROPAGATE_SELECTED_KEYS, "SELECTED_KEYS", 0, "On Selected Keyframes", - "Propagate pose to all selected keyframes"}, + "Propagate pose to all selected keyframes"}, {POSE_PROPAGATE_SELECTED_MARKERS, "SELECTED_MARKERS", 0, "On Selected Markers", - "Propagate pose to all keyframes occurring on frames with Scene Markers after the current frame"}, + "Propagate pose to all keyframes occurring on frames with Scene Markers after the current frame"}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/editors/gpencil/annotate_draw.c b/source/blender/editors/gpencil/annotate_draw.c index f30b3a45971..3d70a7f6843 100644 --- a/source/blender/editors/gpencil/annotate_draw.c +++ b/source/blender/editors/gpencil/annotate_draw.c @@ -717,8 +717,8 @@ static void gp_draw_strokes_edit( /* ----- General Drawing ------ */ /* draw onion-skinning for a layer */ static void gp_draw_onionskins( - bGPdata *gpd, bGPDlayer *gpl, bGPDframe *gpf, int offsx, int offsy, int winx, int winy, - int UNUSED(cfra), int dflag) + bGPdata *gpd, bGPDlayer *gpl, bGPDframe *gpf, int offsx, int offsy, int winx, int winy, + int UNUSED(cfra), int dflag) { const float alpha = 1.0f; float color[4]; @@ -738,8 +738,8 @@ static void gp_draw_onionskins( fac = 1.0f - ((float)(gpf->framenum - gf->framenum) / (float)(gpl->gstep + 1)); color[3] = alpha * fac * 0.66f; gp_draw_strokes( - gpd, gpl, gf, offsx, offsy, winx, winy, dflag, - gpl->thickness, color); + gpd, gpl, gf, offsx, offsy, winx, winy, dflag, + gpl->thickness, color); } else break; @@ -750,8 +750,8 @@ static void gp_draw_onionskins( if (gpf->prev) { color[3] = (alpha / 7); gp_draw_strokes( - gpd, gpl, gpf->prev, offsx, offsy, winx, winy, dflag, - gpl->thickness, color); + gpd, gpl, gpf->prev, offsx, offsy, winx, winy, dflag, + gpl->thickness, color); } } else { @@ -774,8 +774,8 @@ static void gp_draw_onionskins( fac = 1.0f - ((float)(gf->framenum - gpf->framenum) / (float)(gpl->gstep_next + 1)); color[3] = alpha * fac * 0.66f; gp_draw_strokes( - gpd, gpl, gf, offsx, offsy, winx, winy, dflag, - gpl->thickness, color); + gpd, gpl, gf, offsx, offsy, winx, winy, dflag, + gpl->thickness, color); } else break; @@ -786,8 +786,8 @@ static void gp_draw_onionskins( if (gpf->next) { color[3] = (alpha / 4); gp_draw_strokes( - gpd, gpl, gpf->next, offsx, offsy, winx, winy, dflag, - gpl->thickness, color); + gpd, gpl, gpf->next, offsx, offsy, winx, winy, dflag, + gpl->thickness, color); } } else { diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c index f7d813a4a48..349deb6b53e 100644 --- a/source/blender/editors/gpencil/annotate_paint.c +++ b/source/blender/editors/gpencil/annotate_paint.c @@ -227,8 +227,7 @@ static bool gpencil_draw_poll(bContext *C) if ((obact) && (obact->type == OB_GPENCIL) && (obact->mode == OB_MODE_PAINT_GPENCIL)) { - CTX_wm_operator_poll_msg_set(C, - "Annotation cannot be used in grease pencil draw mode"); + CTX_wm_operator_poll_msg_set(C, "Annotation cannot be used in grease pencil draw mode"); return false; } } @@ -2133,8 +2132,7 @@ static void annotation_add_missing_events(bContext *C, wmOperator *op, const wmE interp_v2_v2v2(pt, a, b, 0.5f); sub_v2_v2v2(pt, b, pt); /* create fake event */ - annotation_draw_apply_event(op, event, CTX_data_depsgraph(C), - pt[0], pt[1]); + annotation_draw_apply_event(op, event, CTX_data_depsgraph(C), pt[0], pt[1]); } else if (dist >= factor) { int slices = 2 + (int)((dist - 1.0) / factor); @@ -2143,8 +2141,9 @@ static void annotation_add_missing_events(bContext *C, wmOperator *op, const wmE interp_v2_v2v2(pt, a, b, n * i); sub_v2_v2v2(pt, b, pt); /* create fake event */ - annotation_draw_apply_event(op, event, CTX_data_depsgraph(C), - pt[0], pt[1]); + annotation_draw_apply_event( + op, event, CTX_data_depsgraph(C), + pt[0], pt[1]); } } } @@ -2281,8 +2280,8 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event) if (G.debug & G_DEBUG) { printf("found alternative region %p (old was %p) - at %d %d (sa: %d %d -> %d %d)\n", - current_region, p->ar, event->x, event->y, - p->sa->totrct.xmin, p->sa->totrct.ymin, p->sa->totrct.xmax, p->sa->totrct.ymax); + current_region, p->ar, event->x, event->y, + p->sa->totrct.xmin, p->sa->totrct.ymin, p->sa->totrct.xmax, p->sa->totrct.ymax); } if (current_region) { diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index dafc9507bd1..1ae3176d393 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -570,8 +570,9 @@ static int gp_set_filling_texture(Image *image, short flag) return (int)GL_INVALID_OPERATION; } - GPU_create_gl_tex(bind, ibuf->rect, ibuf->rect_float, ibuf->x, ibuf->y, GL_TEXTURE_2D, - false, false, image); + GPU_create_gl_tex( + bind, ibuf->rect, ibuf->rect_float, ibuf->x, ibuf->y, GL_TEXTURE_2D, + false, false, image); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); @@ -1099,9 +1100,10 @@ static void gp_draw_strokes(tGPDdraw *tgpw) /* 3D Lines - OpenGL primitives-based */ if (gps->totpoints == 1) { if (tgpw->disable_fill != 1) { - gp_draw_stroke_point(gps->points, sthickness, tgpw->dflag, gps->flag, - tgpw->offsx, tgpw->offsy, tgpw->winx, tgpw->winy, - tgpw->diff_mat, ink); + gp_draw_stroke_point( + gps->points, sthickness, tgpw->dflag, gps->flag, + tgpw->offsx, tgpw->offsy, tgpw->winx, tgpw->winy, + tgpw->diff_mat, ink); } } else { @@ -1740,8 +1742,7 @@ void ED_gpencil_draw_view3d_object(wmWindowManager *wm, Scene *scene, Depsgraph ToolSettings *ts = scene->toolsettings; Brush *brush = BKE_paint_brush(&ts->gp_paint->paint); if (brush != NULL) { - gp_draw_data(rv3d, brush, 1.0f, ob, gpd, - offsx, offsy, winx, winy, CFRA, dflag); + gp_draw_data(rv3d, brush, 1.0f, ob, gpd, offsx, offsy, winx, winy, CFRA, dflag); } } diff --git a/source/blender/editors/gpencil/gpencil_armature.c b/source/blender/editors/gpencil/gpencil_armature.c index 97f5db96a89..a482eb837e7 100644 --- a/source/blender/editors/gpencil/gpencil_armature.c +++ b/source/blender/editors/gpencil/gpencil_armature.c @@ -576,14 +576,14 @@ static int gpencil_generate_weights_exec(bContext *C, wmOperator *op) GpencilModifierData *md = BKE_gpencil_modifiers_findByType(ob_eval, eGpencilModifierType_Armature); if (md == NULL) { BKE_report(op->reports, RPT_ERROR, - "The grease pencil object need an Armature modifier"); + "The grease pencil object need an Armature modifier"); return OPERATOR_CANCELLED; } ArmatureGpencilModifierData *mmd = (ArmatureGpencilModifierData *)md; if (mmd->object == NULL) { BKE_report(op->reports, RPT_ERROR, - "Armature modifier is not valid or wrong defined"); + "Armature modifier is not valid or wrong defined"); return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c index ee1838af22a..0403a42a2c9 100644 --- a/source/blender/editors/gpencil/gpencil_brush.c +++ b/source/blender/editors/gpencil/gpencil_brush.c @@ -1269,7 +1269,7 @@ static bool gpsculpt_brush_init(bContext *C, wmOperator *op) if (found == false) { /* STOP HERE! Nothing to paste! */ BKE_report(op->reports, RPT_ERROR, - "Copy some strokes to the clipboard before using the Clone brush to paste copies of them"); + "Copy some strokes to the clipboard before using the Clone brush to paste copies of them"); MEM_freeN(gso); op->customdata = NULL; @@ -1853,8 +1853,7 @@ static int gpsculpt_brush_invoke(bContext *C, wmOperator *op, const wmEvent *eve /* the operator cannot work while play animation */ if (is_playing) { - BKE_report(op->reports, RPT_ERROR, - "Cannot sculpt while play animation"); + BKE_report(op->reports, RPT_ERROR, "Cannot sculpt while play animation"); return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 088282c0f02..1388beb0b20 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -881,8 +881,9 @@ static void gpencil_add_move_points(bGPDframe *gpf, bGPDstroke *gps) /* if last point, add new point at the end */ if (do_last) { - copy_point(gps, temp_points, temp_dverts, - oldtotpoints - 1, gps->totpoints - 1); + copy_point( + gps, temp_points, temp_dverts, + oldtotpoints - 1, gps->totpoints - 1); /* deselect old */ pt = &gps->points[gps->totpoints - 2]; @@ -2600,8 +2601,9 @@ void GPENCIL_OT_snap_to_cursor(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; /* props */ - ot->prop = RNA_def_boolean(ot->srna, "use_offset", true, "With Offset", - "Offset the entire stroke instead of selected points only"); + ot->prop = RNA_def_boolean( + ot->srna, "use_offset", true, "With Offset", + "Offset the entire stroke instead of selected points only"); } /* ------------------------------- */ @@ -3333,8 +3335,9 @@ static int gp_strokes_reproject_exec(bContext *C, wmOperator *op) /* Project stroke in one axis */ if (ELEM(mode, GP_REPROJECT_FRONT, GP_REPROJECT_SIDE, GP_REPROJECT_TOP)) { - ED_gp_get_drawing_reference(scene, ob, gpl, - ts->gpencil_v3d_align, origin); + ED_gp_get_drawing_reference( + scene, ob, gpl, + ts->gpencil_v3d_align, origin); int axis = 0; switch (mode) { @@ -3360,8 +3363,9 @@ static int gp_strokes_reproject_exec(bContext *C, wmOperator *op) } } - ED_gp_project_point_to_plane(ob, rv3d, origin, - axis, &pt2); + ED_gp_project_point_to_plane( + ob, rv3d, origin, + axis, &pt2); copy_v3_v3(&pt->x, &pt2.x); @@ -3666,8 +3670,9 @@ void GPENCIL_OT_stroke_subdivide(wmOperatorType *ot) RNA_def_float(ot->srna, "factor", 0.0f, 0.0f, 2.0f, "Smooth", "", 0.0f, 2.0f); prop = RNA_def_int(ot->srna, "repeat", 1, 1, 10, "Repeat", "", 1, 5); RNA_def_property_flag(prop, PROP_SKIP_SAVE); - RNA_def_boolean(ot->srna, "only_selected", true, "Selected Points", - "Smooth only selected points in the stroke"); + RNA_def_boolean( + ot->srna, "only_selected", true, "Selected Points", + "Smooth only selected points in the stroke"); RNA_def_boolean(ot->srna, "smooth_position", true, "Position", ""); RNA_def_boolean(ot->srna, "smooth_thickness", true, "Thickness", ""); RNA_def_boolean(ot->srna, "smooth_strength", false, "Strength", ""); @@ -4224,8 +4229,9 @@ void GPENCIL_OT_stroke_smooth(wmOperatorType *ot) RNA_def_property_flag(prop, PROP_SKIP_SAVE); RNA_def_float(ot->srna, "factor", 0.5f, 0.0f, 2.0f, "Factor", "", 0.0f, 2.0f); - RNA_def_boolean(ot->srna, "only_selected", true, "Selected Points", - "Smooth only selected points in the stroke"); + RNA_def_boolean( + ot->srna, "only_selected", true, "Selected Points", + "Smooth only selected points in the stroke"); RNA_def_boolean(ot->srna, "smooth_position", true, "Position", ""); RNA_def_boolean(ot->srna, "smooth_thickness", true, "Thickness", ""); RNA_def_boolean(ot->srna, "smooth_strength", false, "Strength", ""); @@ -4306,7 +4312,7 @@ static void gpencil_cutter_dissolve(bGPDlayer *hit_layer, bGPDstroke *hit_stroke } } gp_stroke_delete_tagged_points( - hit_layer->actframe, hit_stroke, gpsn, GP_SPOINT_TAG, false, 1); + hit_layer->actframe, hit_stroke, gpsn, GP_SPOINT_TAG, false, 1); } } @@ -4365,7 +4371,7 @@ static int gpencil_cutter_lasso_select( float r_hita[3], r_hitb[3]; if (gps->totpoints > 1) { ED_gpencil_select_stroke_segment( - gpl, gps, pt, true, true, scale, r_hita, r_hitb); + gpl, gps, pt, true, true, scale, r_hita, r_hitb); } /* avoid infinite loops */ if (gps->totpoints > oldtot) { diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c index 680568a96c5..7668b7cf5fd 100644 --- a/source/blender/editors/gpencil/gpencil_fill.c +++ b/source/blender/editors/gpencil/gpencil_fill.c @@ -349,8 +349,8 @@ static void gp_render_offscreen(tGPDfill *tgpf) glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); ED_view3d_update_viewmat( - tgpf->depsgraph, tgpf->scene, tgpf->v3d, tgpf->ar, - NULL, winmat, NULL); + tgpf->depsgraph, tgpf->scene, tgpf->v3d, tgpf->ar, + NULL, winmat, NULL); /* set for opengl */ GPU_matrix_projection_set(tgpf->rv3d->winmat); GPU_matrix_set(tgpf->rv3d->viewmat); diff --git a/source/blender/editors/gpencil/gpencil_old.c b/source/blender/editors/gpencil/gpencil_old.c index b1924b3cacd..5d6abb594ce 100644 --- a/source/blender/editors/gpencil/gpencil_old.c +++ b/source/blender/editors/gpencil/gpencil_old.c @@ -187,7 +187,7 @@ static int gpencil_convert_old_files_exec(bContext *C, wmOperator *UNUSED(op)) * to put them into from here... */ printf("WARNING: Old Grease Pencil data ('%s') still exists on Object '%s'\n", - ob->gpd->id.name + 2, ob->id.name + 2); + ob->gpd->id.name + 2, ob->id.name + 2); } } } diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 50a7d9d8703..99b38098138 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -830,7 +830,7 @@ static short gp_stroke_addpoint( if (gpencil_project_check(p)) { view3d_region_operator_needs_opengl(p->win, p->ar); ED_view3d_autodist_init( - p->depsgraph, p->ar, v3d, (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) ? 1 : 0); + p->depsgraph, p->ar, v3d, (ts->gpencil_v3d_align & GP_PROJECT_DEPTH_STROKE) ? 1 : 0); } /* convert screen-coordinates to appropriate coordinates (and store them) */ @@ -2306,10 +2306,11 @@ static void gpencil_draw_eraser(bContext *UNUSED(C), int x, int y, void *p_ptr) immUniform1f("dash_width", 12.0f); immUniform1f("dash_factor", 0.5f); - imm_draw_circle_wire_2d(shdr_pos, x, y, p->radius, - /* XXX Dashed shader gives bad results with sets of small segments currently, - * temp hack around the issue. :( */ - max_ii(8, p->radius / 2)); /* was fixed 40 */ + imm_draw_circle_wire_2d( + shdr_pos, x, y, p->radius, + /* XXX Dashed shader gives bad results with sets of small segments currently, + * temp hack around the issue. :( */ + max_ii(8, p->radius / 2)); /* was fixed 40 */ immUnbindProgram(); @@ -3363,8 +3364,7 @@ static void gpencil_add_missing_events(bContext *C, wmOperator *op, const wmEven interp_v2_v2v2(pt, a, b, 0.5f); sub_v2_v2v2(pt, b, pt); /* create fake event */ - gpencil_draw_apply_event(C, op, event, CTX_data_depsgraph(C), - pt[0], pt[1]); + gpencil_draw_apply_event(C, op, event, CTX_data_depsgraph(C), pt[0], pt[1]); } else if (dist >= factor) { int slices = 2 + (int)((dist - 1.0) / factor); @@ -3373,8 +3373,9 @@ static void gpencil_add_missing_events(bContext *C, wmOperator *op, const wmEven interp_v2_v2v2(pt, a, b, n * i); sub_v2_v2v2(pt, b, pt); /* create fake event */ - gpencil_draw_apply_event(C, op, event, CTX_data_depsgraph(C), - pt[0], pt[1]); + gpencil_draw_apply_event( + C, op, event, CTX_data_depsgraph(C), + pt[0], pt[1]); } } } @@ -3577,8 +3578,8 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event) if (G.debug & G_DEBUG) { printf("found alternative region %p (old was %p) - at %d %d (sa: %d %d -> %d %d)\n", - current_region, p->ar, event->x, event->y, - p->sa->totrct.xmin, p->sa->totrct.ymin, p->sa->totrct.xmax, p->sa->totrct.ymax); + current_region, p->ar, event->x, event->y, + p->sa->totrct.xmin, p->sa->totrct.ymin, p->sa->totrct.xmax, p->sa->totrct.ymax); } if (current_region) { @@ -3754,7 +3755,7 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event) /* event doesn't need to be handled */ #if 0 printf("unhandled event -> %d (mmb? = %d | mmv? = %d)\n", - event->type, event->type == MIDDLEMOUSE, event->type == MOUSEMOVE); + event->type, event->type == MIDDLEMOUSE, event->type == MOUSEMOVE); #endif break; } diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index 3a2347d9177..88906488e1a 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -412,32 +412,33 @@ static void gpencil_primitive_status_indicators(bContext *C, tGPDprimitive *tgpi if (tgpi->type == GP_STROKE_LINE) { BLI_strncpy( - msg_str, - IFACE_("Line: ESC to cancel, LMB set origin, Enter/MMB to confirm, WHEEL/+- to adjust subdivision number, Shift to align, Alt to center, E: extrude"), - UI_MAX_DRAW_STR); + msg_str, + IFACE_("Line: ESC to cancel, LMB set origin, Enter/MMB to confirm, WHEEL/+- to adjust subdivision number, Shift to align, Alt to center, E: extrude"), + UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_BOX) { BLI_strncpy( - msg_str, - IFACE_("Rectangle: ESC to cancel, LMB set origin, Enter/MMB to confirm, WHEEL/+- to adjust subdivision number, Shift to square, Alt to center"), - UI_MAX_DRAW_STR); + msg_str, + IFACE_("Rectangle: ESC to cancel, LMB set origin, Enter/MMB to confirm, WHEEL/+- to adjust subdivision number, Shift to square, Alt to center"), + UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_CIRCLE) { BLI_strncpy( - msg_str, - IFACE_("Circle: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to center"), - UI_MAX_DRAW_STR); + msg_str, + IFACE_("Circle: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to center"), + UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_ARC) { - BLI_strncpy(msg_str, - IFACE_("Arc: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to center, M: Flip, E: extrude"), - UI_MAX_DRAW_STR); + BLI_strncpy( + msg_str, + IFACE_("Arc: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to center, M: Flip, E: extrude"), + UI_MAX_DRAW_STR); } else if (tgpi->type == GP_STROKE_CURVE) { BLI_strncpy( - msg_str, - IFACE_("Curve: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to center, E: extrude"), - UI_MAX_DRAW_STR); + msg_str, + IFACE_("Curve: ESC to cancel, Enter/MMB to confirm, WHEEL/+- to adjust edge number, Shift to square, Alt to center, E: extrude"), + UI_MAX_DRAW_STR); } if (ELEM(tgpi->type, GP_STROKE_CIRCLE, GP_STROKE_ARC, GP_STROKE_LINE, GP_STROKE_BOX)) { @@ -924,8 +925,9 @@ static void gp_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi) /* get origin to reproject point */ float origin[3]; - ED_gp_get_drawing_reference(tgpi->scene, tgpi->ob, tgpi->gpl, - ts->gpencil_v3d_align, origin); + ED_gp_get_drawing_reference( + tgpi->scene, tgpi->ob, tgpi->gpl, + ts->gpencil_v3d_align, origin); /* reproject current */ ED_gpencil_tpoint_to_point(tgpi->ar, origin, tpt, &spt); ED_gp_project_point_to_plane(tgpi->ob, tgpi->rv3d, origin, tgpi->lock_axis - 1, &spt); @@ -987,10 +989,11 @@ static void gp_primitive_update_strokes(bContext *C, tGPDprimitive *tgpi) /* reproject to plane */ if (!is_depth) { float origin[3]; - ED_gp_get_drawing_reference(tgpi->scene, tgpi->ob, tgpi->gpl, - ts->gpencil_v3d_align, origin); + ED_gp_get_drawing_reference( + tgpi->scene, tgpi->ob, tgpi->gpl, + ts->gpencil_v3d_align, origin); ED_gp_project_stroke_to_plane( - tgpi->ob, tgpi->rv3d, gps, origin, ts->gp_sculpt.lock_axis - 1); + tgpi->ob, tgpi->rv3d, gps, origin, ts->gp_sculpt.lock_axis - 1); } /* if parented change position relative to parent object */ diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c index 0862a8661a3..99bbf10cdc1 100644 --- a/source/blender/editors/gpencil/gpencil_select.c +++ b/source/blender/editors/gpencil/gpencil_select.c @@ -877,7 +877,7 @@ static bool gp_stroke_do_circle_sel( float r_hita[3], r_hitb[3]; bool hit_select = (bool)(pt1->flag & GP_SPOINT_SELECT); ED_gpencil_select_stroke_segment( - gpl, gps, pt1, hit_select, false, scale, r_hita, r_hitb); + gpl, gps, pt1, hit_select, false, scale, r_hita, r_hitb); } /* Ensure that stroke selection is in sync with its points */ @@ -942,8 +942,8 @@ static int gpencil_circle_select_exec(bContext *C, wmOperator *op) GP_EDITABLE_STROKES_BEGIN(gpstroke_iter, C, gpl, gps) { changed |= gp_stroke_do_circle_sel( - gpl, gps, &gsc, mx, my, radius, select, &rect, - gpstroke_iter.diff_mat, selectmode, scale); + gpl, gps, &gsc, mx, my, radius, select, &rect, + gpstroke_iter.diff_mat, selectmode, scale); } GP_EDITABLE_STROKES_END(gpstroke_iter); @@ -1066,7 +1066,7 @@ static int gpencil_generic_select_exec( bool hit_select = (bool)(pt->flag & GP_SPOINT_SELECT); float r_hita[3], r_hitb[3]; ED_gpencil_select_stroke_segment( - gpl, gps, pt, hit_select, false, scale, r_hita, r_hitb); + gpl, gps, pt, hit_select, false, scale, r_hita, r_hitb); } } diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c index 5f703808d53..84bfd709b10 100644 --- a/source/blender/editors/gpencil/gpencil_utils.c +++ b/source/blender/editors/gpencil/gpencil_utils.c @@ -796,8 +796,9 @@ bool gp_point_xy_to_3d(const GP_SpaceConversion *gsc, Scene *scene, const float const RegionView3D *rv3d = gsc->ar->regiondata; float rvec[3]; - ED_gp_get_drawing_reference(scene, gsc->ob, gsc->gpl, - scene->toolsettings->gpencil_v3d_align, rvec); + ED_gp_get_drawing_reference( + scene, gsc->ob, gsc->gpl, + scene->toolsettings->gpencil_v3d_align, rvec); float zfac = ED_view3d_calc_zfac(rv3d, rvec, NULL); @@ -2217,8 +2218,8 @@ int ED_gpencil_select_stroke_segment( int direction = 0; float(*points2d)[2] = MEM_mallocN(sizeof(*points2d) * gps->totpoints, "GP Stroke temp 2d points"); BKE_gpencil_stroke_2d_flat_ref( - gps->points, gps->totpoints, - gps->points, gps->totpoints, points2d, scale, &direction); + gps->points, gps->totpoints, + gps->points, gps->totpoints, points2d, scale, &direction); GHash *all_2d = BLI_ghash_ptr_new(__func__); @@ -2229,9 +2230,9 @@ int ED_gpencil_select_stroke_segment( /* the extremes of the stroke are scaled to improve collision detection * for near lines */ BKE_gpencil_stroke_2d_flat_ref( - gps->points, gps->totpoints, - gps_iter->points, gps_iter->totpoints, points2d_iter, - scale, &direction); + gps->points, gps->totpoints, + gps_iter->points, gps_iter->totpoints, points2d_iter, + scale, &direction); BLI_ghash_insert(all_2d, gps_iter, points2d_iter); } @@ -2255,7 +2256,7 @@ int ED_gpencil_select_stroke_segment( copy_v2_v2(p2d_a2, points2d[i2]); hit_a = gpencil_check_collision( - gps, gps_array, all_2d, totstrokes, p2d_a1, p2d_a2, r_hit2d); + gps, gps_array, all_2d, totstrokes, p2d_a1, p2d_a2, r_hit2d); if (select) { pta1->flag |= GP_SPOINT_SELECT; @@ -2289,7 +2290,7 @@ int ED_gpencil_select_stroke_segment( copy_v2_v2(p2d_a2, points2d[i2]); hit_b = gpencil_check_collision( - gps, gps_array, all_2d, totstrokes, p2d_a1, p2d_a2, r_hit2d); + gps, gps_array, all_2d, totstrokes, p2d_a1, p2d_a2, r_hit2d); if (select) { pta1->flag |= GP_SPOINT_SELECT; diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index bb49f024bc3..df116b3f7ae 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -1328,8 +1328,8 @@ void UI_view2d_grid_draw(View2D *v2d, View2DGrid *grid, int flag) { float vec1[2], vec2[2]; int a, step; - int vertical_minor_step = (BLI_rcti_size_x(&v2d->mask) + 1) / (U.v2d_min_gridsize * UI_DPI_FAC), - horizontal_major_step = (BLI_rcti_size_y(&v2d->mask) + 1) / (U.v2d_min_gridsize * UI_DPI_FAC); + int vertical_minor_step = (BLI_rcti_size_x(&v2d->mask) + 1) / (U.v2d_min_gridsize * UI_DPI_FAC); + int horizontal_major_step = (BLI_rcti_size_y(&v2d->mask) + 1) / (U.v2d_min_gridsize * UI_DPI_FAC); uchar grid_line_color[3]; /* check for grid first, as it may not exist */ diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index d73ddfac2f6..3829821ef2e 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -500,11 +500,13 @@ void WM_OT_collada_export(wmOperatorType *ot) "Export also the curve handles (if available) (this does only work when the inverse parent matrix " "is the unity matrix, otherwise you may end up with odd results)"); - RNA_def_boolean(func, "keep_keyframes", 0, "Keep Keyframes", - "Use existing keyframes as additional sample points (this helps when you want to keep manual tweaks)"); + RNA_def_boolean( + func, "keep_keyframes", 0, "Keep Keyframes", + "Use existing keyframes as additional sample points (this helps when you want to keep manual tweaks)"); - RNA_def_boolean(func, "keep_flat_curves", 0, "All keyed curves", - "Export also curves which have only one key or are totally flat"); + RNA_def_boolean( + func, "keep_flat_curves", 0, "All keyed curves", + "Export also curves which have only one key or are totally flat"); RNA_def_boolean(func, "active_uv_only", 0, "Only Selected UV Map", "Export only the selected UV Map"); diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c index 0b079fddbfb..1059374dcc5 100644 --- a/source/blender/editors/mesh/editmesh_bevel.c +++ b/source/blender/editors/mesh/editmesh_bevel.c @@ -146,8 +146,9 @@ static void edbm_bevel_update_header(bContext *C, wmOperator *op) BLI_snprintf(offset_str, NUM_STR_REP_LEN, "%.1f%%", RNA_float_get(op->ptr, "offset_pct")); } else { - bUnit_AsString2(offset_str, NUM_STR_REP_LEN, (double)RNA_float_get(op->ptr, "offset"), 3, - B_UNIT_LENGTH, &sce->unit, true); + bUnit_AsString2( + offset_str, NUM_STR_REP_LEN, (double)RNA_float_get(op->ptr, "offset"), 3, + B_UNIT_LENGTH, &sce->unit, true); } prop = RNA_struct_find_property(op->ptr, "offset_type"); @@ -157,46 +158,47 @@ static void edbm_bevel_update_header(bContext *C, wmOperator *op) prop = RNA_struct_find_property(op->ptr, "miter_inner"); RNA_property_enum_name_gettexted(C, op->ptr, prop, RNA_property_enum_get(op->ptr, prop), &imiter_str); - BLI_snprintf(header, sizeof(header), - IFACE_("%s: confirm, " - "%s: cancel, " - "%s: mode (%s), " - "%s: width (%s), " - "%s: segments (%d), " - "%s: profile (%.3f), " - "%s: clamp overlap (%s), " - "%s: vertex only (%s), " - "%s: outer miter (%s), " - "%s: inner miter (%s), " - "%s: harden normals (%s), " - "%s: mark seam (%s), " - "%s: mark sharp (%s)" - ), - WM_MODALKEY(BEV_MODAL_CONFIRM), - WM_MODALKEY(BEV_MODAL_CANCEL), - WM_MODALKEY(BEV_MODAL_OFFSET_MODE_CHANGE), - mode_str, - WM_MODALKEY(BEV_MODAL_VALUE_OFFSET), - offset_str, - WM_MODALKEY(BEV_MODAL_VALUE_SEGMENTS), - RNA_int_get(op->ptr, "segments"), - WM_MODALKEY(BEV_MODAL_VALUE_PROFILE), - RNA_float_get(op->ptr, "profile"), - WM_MODALKEY(BEV_MODAL_CLAMP_OVERLAP_TOGGLE), - WM_bool_as_string(RNA_boolean_get(op->ptr, "clamp_overlap")), - WM_MODALKEY(BEV_MODAL_VERTEX_ONLY_TOGGLE), - WM_bool_as_string(RNA_boolean_get(op->ptr, "vertex_only")), - WM_MODALKEY(BEV_MODAL_OUTER_MITER_CHANGE), - omiter_str, - WM_MODALKEY(BEV_MODAL_INNER_MITER_CHANGE), - imiter_str, - WM_MODALKEY(BEV_MODAL_HARDEN_NORMALS_TOGGLE), - WM_bool_as_string(RNA_boolean_get(op->ptr, "harden_normals")), - WM_MODALKEY(BEV_MODAL_MARK_SEAM_TOGGLE), - WM_bool_as_string(RNA_boolean_get(op->ptr, "mark_seam")), - WM_MODALKEY(BEV_MODAL_MARK_SHARP_TOGGLE), - WM_bool_as_string(RNA_boolean_get(op->ptr, "mark_sharp")) - ); + BLI_snprintf( + header, sizeof(header), + IFACE_("%s: confirm, " + "%s: cancel, " + "%s: mode (%s), " + "%s: width (%s), " + "%s: segments (%d), " + "%s: profile (%.3f), " + "%s: clamp overlap (%s), " + "%s: vertex only (%s), " + "%s: outer miter (%s), " + "%s: inner miter (%s), " + "%s: harden normals (%s), " + "%s: mark seam (%s), " + "%s: mark sharp (%s)" + ), + WM_MODALKEY(BEV_MODAL_CONFIRM), + WM_MODALKEY(BEV_MODAL_CANCEL), + WM_MODALKEY(BEV_MODAL_OFFSET_MODE_CHANGE), + mode_str, + WM_MODALKEY(BEV_MODAL_VALUE_OFFSET), + offset_str, + WM_MODALKEY(BEV_MODAL_VALUE_SEGMENTS), + RNA_int_get(op->ptr, "segments"), + WM_MODALKEY(BEV_MODAL_VALUE_PROFILE), + RNA_float_get(op->ptr, "profile"), + WM_MODALKEY(BEV_MODAL_CLAMP_OVERLAP_TOGGLE), + WM_bool_as_string(RNA_boolean_get(op->ptr, "clamp_overlap")), + WM_MODALKEY(BEV_MODAL_VERTEX_ONLY_TOGGLE), + WM_bool_as_string(RNA_boolean_get(op->ptr, "vertex_only")), + WM_MODALKEY(BEV_MODAL_OUTER_MITER_CHANGE), + omiter_str, + WM_MODALKEY(BEV_MODAL_INNER_MITER_CHANGE), + imiter_str, + WM_MODALKEY(BEV_MODAL_HARDEN_NORMALS_TOGGLE), + WM_bool_as_string(RNA_boolean_get(op->ptr, "harden_normals")), + WM_MODALKEY(BEV_MODAL_MARK_SEAM_TOGGLE), + WM_bool_as_string(RNA_boolean_get(op->ptr, "mark_seam")), + WM_MODALKEY(BEV_MODAL_MARK_SHARP_TOGGLE), + WM_bool_as_string(RNA_boolean_get(op->ptr, "mark_sharp")) + ); #undef WM_MODALKEY @@ -223,7 +225,7 @@ static bool edbm_bevel_init(bContext *C, wmOperator *op, const bool is_modal) { uint ob_store_len = 0; Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data( - view_layer, CTX_wm_view3d(C), &ob_store_len); + view_layer, CTX_wm_view3d(C), &ob_store_len); opdata->ob_store = MEM_malloc_arrayN(ob_store_len, sizeof(*opdata->ob_store), __func__); for (uint ob_index = 0; ob_index < ob_store_len; ob_index++) { Object *obedit = objects[ob_index]; @@ -272,8 +274,9 @@ static bool edbm_bevel_init(bContext *C, wmOperator *op, const bool is_modal) for (uint ob_index = 0; ob_index < opdata->ob_store_len; ob_index++) { opdata->ob_store[ob_index].mesh_backup = EDBM_redo_state_store(opdata->ob_store[ob_index].em); } - opdata->draw_handle_pixel = ED_region_draw_cb_activate(ar->type, ED_region_draw_mouse_line_cb, - opdata->mcenter, REGION_DRAW_POST_PIXEL); + opdata->draw_handle_pixel = ED_region_draw_cb_activate( + ar->type, ED_region_draw_mouse_line_cb, + opdata->mcenter, REGION_DRAW_POST_PIXEL); G.moving = G_TRANSFORM_EDIT; if (v3d) { @@ -565,31 +568,31 @@ wmKeyMap *bevel_modal_keymap(wmKeyConfig *keyconf) {BEV_MODAL_CANCEL, "CANCEL", 0, "Cancel", "Cancel bevel"}, {BEV_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", "Confirm bevel"}, {BEV_MODAL_VALUE_OFFSET, "VALUE_OFFSET", 0, "Value is offset", - "Value changes offset"}, + "Value changes offset"}, {BEV_MODAL_VALUE_PROFILE, "VALUE_PROFILE", 0, "Value is profile", - "Value changes profile"}, + "Value changes profile"}, {BEV_MODAL_VALUE_SEGMENTS, "VALUE_SEGMENTS", 0, "Value is segments", - "Value changes segments"}, + "Value changes segments"}, {BEV_MODAL_SEGMENTS_UP, "SEGMENTS_UP", 0, "Increase segments", - "Increase segments"}, + "Increase segments"}, {BEV_MODAL_SEGMENTS_DOWN, "SEGMENTS_DOWN", 0, "Decrease segments", - "Decrease segments"}, + "Decrease segments"}, {BEV_MODAL_OFFSET_MODE_CHANGE, "OFFSET_MODE_CHANGE", 0, "Change offset mode", - "Cycle through offset modes"}, + "Cycle through offset modes"}, {BEV_MODAL_CLAMP_OVERLAP_TOGGLE, "CLAMP_OVERLAP_TOGGLE", 0, "Toggle clamp overlap", - "Toggle clamp overlap flag"}, + "Toggle clamp overlap flag"}, {BEV_MODAL_VERTEX_ONLY_TOGGLE, "VERTEX_ONLY_TOGGLE", 0, "Toggle vertex only", - "Toggle vertex only flag"}, + "Toggle vertex only flag"}, {BEV_MODAL_HARDEN_NORMALS_TOGGLE, "HARDEN_NORMALS_TOGGLE", 0, "Toggle harden normals", - "Toggle harden normals flag"}, + "Toggle harden normals flag"}, {BEV_MODAL_MARK_SEAM_TOGGLE, "MARK_SEAM_TOGGLE", 0, "Toggle mark seam", - "Toggle mark seam flag"}, + "Toggle mark seam flag"}, {BEV_MODAL_MARK_SHARP_TOGGLE, "MARK_SHARP_TOGGLE", 0, "Toggle mark sharp", - "Toggle mark sharp flag"}, + "Toggle mark sharp flag"}, {BEV_MODAL_OUTER_MITER_CHANGE, "OUTER_MITER_CHANGE", 0, "Change outer miter", - "Cycle through outer miter kinds"}, + "Cycle through outer miter kinds"}, {BEV_MODAL_INNER_MITER_CHANGE, "INNER_MITER_CHANGE", 0, "Change inner miter", - "Cycle through inner miter kinds"}, + "Cycle through inner miter kinds"}, {0, NULL, 0, NULL, NULL}, }; @@ -868,26 +871,34 @@ void MESH_OT_bevel(wmOperatorType *ot) RNA_def_property_range(prop, 0.0, 100); RNA_def_property_ui_text(prop, "Width Percent", "Bevel amount for percentage method"); RNA_def_int(ot->srna, "segments", 1, 1, SEGMENTS_HARD_MAX, "Segments", "Segments for curved edge", 1, 100); - RNA_def_float(ot->srna, "profile", 0.5f, PROFILE_HARD_MIN, 1.0f, "Profile", - "Controls profile shape (0.5 = round)", PROFILE_HARD_MIN, 1.0f); + RNA_def_float( + ot->srna, "profile", 0.5f, PROFILE_HARD_MIN, 1.0f, "Profile", + "Controls profile shape (0.5 = round)", PROFILE_HARD_MIN, 1.0f); RNA_def_boolean(ot->srna, "vertex_only", false, "Vertex Only", "Bevel only vertices"); - RNA_def_boolean(ot->srna, "clamp_overlap", false, "Clamp Overlap", - "Do not allow beveled edges/vertices to overlap each other"); + RNA_def_boolean( + ot->srna, "clamp_overlap", false, "Clamp Overlap", + "Do not allow beveled edges/vertices to overlap each other"); RNA_def_boolean(ot->srna, "loop_slide", true, "Loop Slide", "Prefer slide along edge to even widths"); RNA_def_boolean(ot->srna, "mark_seam", false, "Mark Seams", "Mark Seams along beveled edges"); RNA_def_boolean(ot->srna, "mark_sharp", false, "Mark Sharp", "Mark beveled edges as sharp"); - RNA_def_int(ot->srna, "material", -1, -1, INT_MAX, "Material", - "Material for bevel faces (-1 means use adjacent faces)", -1, 100); - RNA_def_boolean(ot->srna, "harden_normals", false, "Harden Normals", - "Match normals of new faces to adjacent faces"); - RNA_def_enum(ot->srna, "face_strength_mode", face_strength_mode_items, BEVEL_FACE_STRENGTH_NONE, - "Face Strength Mode", "Whether to set face strength, and which faces to set face strength on"); - RNA_def_enum(ot->srna, "miter_outer", miter_outer_items, BEVEL_MITER_SHARP, - "Outer Miter", "Pattern to use for outside of miters"); - RNA_def_enum(ot->srna, "miter_inner", miter_inner_items, BEVEL_MITER_SHARP, - "Inner Miter", "Pattern to use for inside of miters"); - RNA_def_float(ot->srna, "spread", 0.1f, 0.0f, 1e6f, "Spread", - "Amount to spread arcs for arc inner miters", 0.0f, 100.0f); + RNA_def_int( + ot->srna, "material", -1, -1, INT_MAX, "Material", + "Material for bevel faces (-1 means use adjacent faces)", -1, 100); + RNA_def_boolean( + ot->srna, "harden_normals", false, "Harden Normals", + "Match normals of new faces to adjacent faces"); + RNA_def_enum( + ot->srna, "face_strength_mode", face_strength_mode_items, BEVEL_FACE_STRENGTH_NONE, + "Face Strength Mode", "Whether to set face strength, and which faces to set face strength on"); + RNA_def_enum( + ot->srna, "miter_outer", miter_outer_items, BEVEL_MITER_SHARP, + "Outer Miter", "Pattern to use for outside of miters"); + RNA_def_enum( + ot->srna, "miter_inner", miter_inner_items, BEVEL_MITER_SHARP, + "Inner Miter", "Pattern to use for inside of miters"); + RNA_def_float( + ot->srna, "spread", 0.1f, 0.0f, 1e6f, "Spread", + "Amount to spread arcs for arc inner miters", 0.0f, 100.0f); prop = RNA_def_boolean(ot->srna, "release_confirm", 0, "Confirm on Release", ""); RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE); diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c index ab49a6ce203..f2ba227fd2e 100644 --- a/source/blender/editors/mesh/editmesh_extrude.c +++ b/source/blender/editors/mesh/editmesh_extrude.c @@ -307,9 +307,9 @@ static int edbm_extrude_repeat_exec(bContext *C, wmOperator *op) edbm_extrude_ex(obedit, em, BM_ALL_NOLOOP, BM_ELEM_SELECT, false, false, false); BMO_op_callf( - em->bm, BMO_FLAG_DEFAULTS, - "translate vec=%v verts=%hv", - dvec, BM_ELEM_SELECT); + em->bm, BMO_FLAG_DEFAULTS, + "translate vec=%v verts=%hv", + dvec, BM_ELEM_SELECT); } EDBM_mesh_normals_update(em); diff --git a/source/blender/editors/mesh/editmesh_intersect.c b/source/blender/editors/mesh/editmesh_intersect.c index 08486f28669..c500683a228 100644 --- a/source/blender/editors/mesh/editmesh_intersect.c +++ b/source/blender/editors/mesh/editmesh_intersect.c @@ -884,8 +884,8 @@ static int edbm_face_split_by_edges_exec(bContext *C, wmOperator *UNUSED(op)) float v_pivot_co[3]; float v_pivot_fac; BMEdge *e_split = bm_face_split_edge_find( - e, f, v_pivot, bm->ftable, bm->totface, - v_pivot_co, &v_pivot_fac); + e, f, v_pivot, bm->ftable, bm->totface, + v_pivot_co, &v_pivot_fac); if (e_split) { /* for degenerate cases this vertex may be in one @@ -918,9 +918,9 @@ static int edbm_face_split_by_edges_exec(bContext *C, wmOperator *UNUSED(op)) struct LinkBase *e_ls_base = BLI_ghashIterator_getValue(&gh_iter); bm_face_split_by_edges_island_connect( - bm, f, - e_ls_base->list, e_ls_base->list_len, - mem_arena_edgenet); + bm, f, + e_ls_base->list, e_ls_base->list_len, + mem_arena_edgenet); BLI_memarena_clear(mem_arena_edgenet); } diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 17ddb48cbdc..9a58608081f 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -8197,7 +8197,7 @@ static int edbm_set_normals_from_faces_exec(bContext *C, wmOperator *op) if (!is_zero_v3(vnors[v_index])) { short *clnors = BM_ELEM_CD_GET_VOID_P(l, cd_clnors_offset); BKE_lnor_space_custom_normal_to_data( - bm->lnor_spacearr->lspacearr[l_index], vnors[v_index], clnors); + bm->lnor_spacearr->lspacearr[l_index], vnors[v_index], clnors); if (bm->lnor_spacearr->lspacearr[l_index]->flags & MLNOR_SPACE_IS_SINGLE) { BLI_BITMAP_ENABLE(loop_set, l_index); diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index a55163b01d1..c8a755a3971 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -283,8 +283,7 @@ static bool object_modifier_safe_to_delete(Main *bmain, Object *ob, ModifierType type) { return (!object_has_modifier(ob, exclude, type) && - !ED_object_iter_other(bmain, ob, false, - object_has_modifier_cb, &type)); + !ED_object_iter_other(bmain, ob, false, object_has_modifier_cb, &type)); } static bool object_modifier_remove(Main *bmain, Object *ob, ModifierData *md, @@ -1182,9 +1181,10 @@ static int multires_higher_levels_delete_exec(bContext *C, wmOperator *op) multiresModifier_del_levels(mmd, scene, ob, 1); - ED_object_iter_other(CTX_data_main(C), ob, true, - ED_object_multires_update_totlevels_cb, - &mmd->totlvl); + ED_object_iter_other( + CTX_data_main(C), ob, true, + ED_object_multires_update_totlevels_cb, + &mmd->totlvl); WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob); @@ -1227,9 +1227,10 @@ static int multires_subdivide_exec(bContext *C, wmOperator *op) multiresModifier_subdivide(mmd, scene, ob, 0, mmd->simple); - ED_object_iter_other(CTX_data_main(C), ob, true, - ED_object_multires_update_totlevels_cb, - &mmd->totlvl); + ED_object_iter_other( + CTX_data_main(C), ob, true, + ED_object_multires_update_totlevels_cb, + &mmd->totlvl); DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); WM_event_add_notifier(C, NC_OBJECT | ND_MODIFIER, ob); @@ -1404,8 +1405,8 @@ void OBJECT_OT_multires_external_save(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_INTERNAL; WM_operator_properties_filesel( - ot, FILE_TYPE_FOLDER | FILE_TYPE_BTX, FILE_SPECIAL, FILE_SAVE, - WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY, FILE_SORT_ALPHA); + ot, FILE_TYPE_FOLDER | FILE_TYPE_BTX, FILE_SPECIAL, FILE_SAVE, + WM_FILESEL_FILEPATH | WM_FILESEL_RELPATH, FILE_DEFAULTDISPLAY, FILE_SORT_ALPHA); edit_modifier_properties(ot); } @@ -1769,8 +1770,9 @@ static Object *modifier_skin_armature_create(Depsgraph *depsgraph, Main *bmain, arm->edbo = MEM_callocN(sizeof(ListBase), "edbo armature"); mvert_skin = CustomData_get_layer(&me->vdata, CD_MVERT_SKIN); - BKE_mesh_vert_edge_map_create(&emap, &emap_mem, - me->medge, me->totvert, me->totedge); + BKE_mesh_vert_edge_map_create( + &emap, &emap_mem, + me->medge, me->totvert, me->totedge); edges_visited = BLI_BITMAP_NEW(me->totedge, "edge_visited"); @@ -2174,9 +2176,10 @@ static int ocean_bake_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } - och = BKE_ocean_init_cache(omd->cachepath, modifier_path_relbase(bmain, ob), - omd->bakestart, omd->bakeend, omd->wave_scale, - omd->chop_amount, omd->foam_coverage, omd->foam_fade, omd->resolution); + och = BKE_ocean_init_cache( + omd->cachepath, modifier_path_relbase(bmain, ob), + omd->bakestart, omd->bakeend, omd->wave_scale, + omd->chop_amount, omd->foam_coverage, omd->foam_fade, omd->resolution); och->time = MEM_mallocN(och->duration * sizeof(float), "foam bake time"); @@ -2213,8 +2216,9 @@ static int ocean_bake_exec(bContext *C, wmOperator *op) scene->r.cfra = cfra; /* setup job */ - wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), scene, "Ocean Simulation", - WM_JOB_PROGRESS, WM_JOB_TYPE_OBJECT_SIM_OCEAN); + wm_job = WM_jobs_get( + CTX_wm_manager(C), CTX_wm_window(C), scene, "Ocean Simulation", + WM_JOB_PROGRESS, WM_JOB_TYPE_OBJECT_SIM_OCEAN); oj = MEM_callocN(sizeof(OceanBakeJob), "ocean bake job"); oj->owner = ob; oj->ocean = ocean; diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index 7a786f352bc..0b63d7455f2 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -4477,8 +4477,8 @@ static bool shape_cut_test_point(PEData *data, ParticleCacheKey *key) userdata.num_hits = 0; BLI_bvhtree_ray_cast_all( - shape_bvh->tree, key->co, dir, 0.0f, BVH_RAYCAST_DIST_MAX, - point_inside_bvh_cb, &userdata); + shape_bvh->tree, key->co, dir, 0.0f, BVH_RAYCAST_DIST_MAX, + point_inside_bvh_cb, &userdata); /* for any point inside a watertight mesh the number of hits is uneven */ return (userdata.num_hits % 2) == 1; diff --git a/source/blender/editors/render/render_opengl.c b/source/blender/editors/render/render_opengl.c index feadc88e1d7..0e0292c8d71 100644 --- a/source/blender/editors/render/render_opengl.c +++ b/source/blender/editors/render/render_opengl.c @@ -327,7 +327,7 @@ static void screen_opengl_render_doit(const bContext *C, OGLRender *oglrender, R G.f |= G_FLAG_RENDER_VIEWPORT; ED_gpencil_draw_ex( - view_layer, rv3d, scene, gpd, sizex, sizey, scene->r.cfra, SPACE_SEQ); + view_layer, rv3d, scene, gpd, sizex, sizey, scene->r.cfra, SPACE_SEQ); G.f &= ~G_FLAG_RENDER_VIEWPORT; gp_rect = MEM_mallocN(sizex * sizey * sizeof(unsigned char) * 4, "offscreen rect"); diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 329aec52100..0d4a8b8a71f 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -898,10 +898,12 @@ static int light_cache_bake_invoke(bContext *C, wmOperator *op, const wmEvent *U void SCENE_OT_light_cache_bake(wmOperatorType *ot) { static const EnumPropertyItem light_cache_subset_items[] = { - {LIGHTCACHE_SUBSET_ALL, "ALL", 0, "All LightProbes", "Bake both irradiance grids and reflection cubemaps"}, - {LIGHTCACHE_SUBSET_DIRTY, "DIRTY", 0, "Dirty Only", "Only bake lightprobes that are marked as dirty"}, - {LIGHTCACHE_SUBSET_CUBE, "CUBEMAPS", 0, "Cubemaps Only", "Try to only bake reflection cubemaps if irradiance " - "grids are up to date"}, + {LIGHTCACHE_SUBSET_ALL, "ALL", 0, "All LightProbes", + "Bake both irradiance grids and reflection cubemaps"}, + {LIGHTCACHE_SUBSET_DIRTY, "DIRTY", 0, "Dirty Only", + "Only bake lightprobes that are marked as dirty"}, + {LIGHTCACHE_SUBSET_CUBE, "CUBEMAPS", 0, "Cubemaps Only", + "Try to only bake reflection cubemaps if irradiance grids are up to date"}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/editors/sculpt_paint/paint_stroke.c b/source/blender/editors/sculpt_paint/paint_stroke.c index a782ca9a5ec..d66224034eb 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.c +++ b/source/blender/editors/sculpt_paint/paint_stroke.c @@ -808,9 +808,9 @@ static void stroke_done(struct bContext *C, struct wmOperator *op) if (stroke->timer) { WM_event_remove_timer( - CTX_wm_manager(C), - CTX_wm_window(C), - stroke->timer); + CTX_wm_manager(C), + CTX_wm_window(C), + stroke->timer); } if (stroke->rng) { diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index f1ada42100d..4149be9c4d1 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -890,7 +890,7 @@ static void do_weight_paint_vertex_multi( } oldw = BKE_defvert_multipaint_collective_weight( - dv_prev, wpi->defbase_tot, wpi->defbase_sel, wpi->defbase_tot_sel, wpi->do_auto_normalize); + dv_prev, wpi->defbase_tot, wpi->defbase_sel, wpi->defbase_tot_sel, wpi->do_auto_normalize); } else { oldw = curw; diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index f1b41ff792a..34c049c0548 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -1859,8 +1859,8 @@ static void do_topology_rake_bmesh_task_cb_ex( float tmp[3]; mul_v3_v3fl( - tmp, ss->cache->sculpt_normal_symm, - dot_v3v3(ss->cache->sculpt_normal_symm, direction)); + tmp, ss->cache->sculpt_normal_symm, + dot_v3v3(ss->cache->sculpt_normal_symm, direction)); sub_v3_v3(direction, tmp); /* Cancel if there's no grab data. */ @@ -1880,8 +1880,8 @@ static void do_topology_rake_bmesh_task_cb_ex( { if (sculpt_brush_test_sq_fn(&test, vd.co)) { const float fade = bstrength * tex_strength( - ss, brush, vd.co, sqrtf(test.dist), - vd.no, vd.fno, *vd.mask, tls->thread_id) * ss->cache->pressure; + ss, brush, vd.co, sqrtf(test.dist), + vd.no, vd.fno, *vd.mask, tls->thread_id) * ss->cache->pressure; float avg[3], val[3]; diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index bcf536e9d97..067e0f57433 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -156,8 +156,9 @@ static void buttons_texture_modifier_gpencil_foreach(void *userData, Object *ob, RNA_pointer_create(&ob->id, &RNA_GpencilModifier, md, &ptr); prop = RNA_struct_find_property(&ptr, propname); - buttons_texture_user_property_add(users, &ob->id, ptr, prop, - N_("Grease Pencil Modifiers"), RNA_struct_ui_icon(ptr.type), md->name); + buttons_texture_user_property_add( + users, &ob->id, ptr, prop, + N_("Grease Pencil Modifiers"), RNA_struct_ui_icon(ptr.type), md->name); } static void buttons_texture_users_from_context(ListBase *users, const bContext *C, SpaceProperties *sbuts) diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index e788af1507e..fdcc915737d 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -475,9 +475,9 @@ static void stats_string(ViewLayer *view_layer) } else if ((ob) && (ob->type == OB_GPENCIL)) { ofs += BLI_snprintf(s + ofs, MAX_INFO_LEN - ofs, - IFACE_("Layers:%s | Frames:%s | Strokes:%s | Points:%s | Objects:%s/%s"), - stats_fmt.totgplayer, stats_fmt.totgpframe, stats_fmt.totgpstroke, - stats_fmt.totgppoint, stats_fmt.totobjsel, stats_fmt.totobj); + IFACE_("Layers:%s | Frames:%s | Strokes:%s | Points:%s | Objects:%s/%s"), + stats_fmt.totgplayer, stats_fmt.totgpframe, stats_fmt.totgpstroke, + stats_fmt.totgppoint, stats_fmt.totobjsel, stats_fmt.totobj); ofs += BLI_strncpy_rlen(s + ofs, memstr, MAX_INFO_LEN - ofs); ofs += BLI_strncpy_rlen(s + ofs, gpumemstr, MAX_INFO_LEN - ofs); diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 31a4b15425c..3b6ca4934fe 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -982,8 +982,9 @@ static ImBuf *sequencer_make_scope(Scene *scene, ImBuf *ibuf, ImBuf *(*make_scop ImBuf *display_ibuf = IMB_dupImBuf(ibuf); ImBuf *scope; - IMB_colormanagement_imbuf_make_display_space(display_ibuf, &scene->view_settings, - &scene->display_settings); + IMB_colormanagement_imbuf_make_display_space( + display_ibuf, &scene->view_settings, + &scene->display_settings); scope = make_scope_cb(display_ibuf); @@ -1078,12 +1079,13 @@ void sequencer_draw_maskedit(const bContext *C, Scene *scene, ARegion *ar, Space width = (scene->r.size * scene->r.xsch) / 100; height = (scene->r.size * scene->r.ysch) / 100; - ED_mask_draw_region(mask, ar, - 0, 0, 0, /* TODO */ - width, height, - aspx, aspy, - false, true, - NULL, C); + ED_mask_draw_region( + mask, ar, + 0, 0, 0, /* TODO */ + width, height, + aspx, aspy, + false, true, + NULL, C); } } } diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 2108fc1ac07..fe84e5b3244 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -472,8 +472,9 @@ void VIEW3D_OT_snap_selected_to_cursor(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_USE_EVAL_DATA; /* rna */ - RNA_def_boolean(ot->srna, "use_offset", 1, "Offset", - "If the selection should be snapped as a whole or by each object center"); + RNA_def_boolean( + ot->srna, "use_offset", 1, "Offset", + "If the selection should be snapped as a whole or by each object center"); } /* *************************************************** */ diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 4e41b3a1065..c447d75657b 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -4189,7 +4189,7 @@ static void headerRotation(TransInfo *t, char str[UI_MAX_DRAW_STR], float final) } else { ofs += BLI_snprintf(str + ofs, UI_MAX_DRAW_STR - ofs, IFACE_("Rot: %.2f%s %s"), - RAD2DEGF(final), t->con.text, t->proptext); + RAD2DEGF(final), t->con.text, t->proptext); } if (t->flag & T_PROP_EDIT_ALL) { @@ -4650,7 +4650,7 @@ void freeCustomNormalArray(TransInfo *t, TransDataContainer *tc, TransCustomData /* Restore custom loop normal on cancel */ for (int i = 0; i < lnors_ed_arr->totloop; i++, lnor_ed++) { BKE_lnor_space_custom_normal_to_data( - bm->lnor_spacearr->lspacearr[lnor_ed->loop_index], lnor_ed->niloc, lnor_ed->clnors_data); + bm->lnor_spacearr->lspacearr[lnor_ed->loop_index], lnor_ed->niloc, lnor_ed->clnors_data); } } @@ -4727,7 +4727,7 @@ static void applyNormalRotation(TransInfo *t, const int UNUSED(mval[2])) mul_v3_m3v3(lnor_ed->nloc, mat, lnor_ed->niloc); BKE_lnor_space_custom_normal_to_data( - bm->lnor_spacearr->lspacearr[lnor_ed->loop_index], lnor_ed->nloc, lnor_ed->clnors_data); + bm->lnor_spacearr->lspacearr[lnor_ed->loop_index], lnor_ed->nloc, lnor_ed->clnors_data); } } diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 75d1aa9343d..43e038ea17c 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -8480,8 +8480,9 @@ static void createTransGPencil(bContext *C, TransInfo *t) 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 = BKE_gpencil_multiframe_falloff_calc(gpf, gpl->actframe->framenum, - f_init, f_end, ts->gp_sculpt.cur_falloff); + falloff = BKE_gpencil_multiframe_falloff_calc( + gpf, gpl->actframe->framenum, + f_init, f_end, ts->gp_sculpt.cur_falloff); } for (gps = gpf->strokes.first; gps; gps = gps->next) { |