From 0ac990d088d553c27f5360f62e142e99f087890a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 22 Apr 2019 00:18:34 +1000 Subject: Cleanup: comments (long lines) in editors --- source/blender/editors/screen/area.c | 9 ++++++--- source/blender/editors/screen/glutil.c | 6 ++++-- source/blender/editors/screen/screen_context.c | 12 +++++++----- source/blender/editors/screen/screen_draw.c | 6 ++++-- source/blender/editors/screen/screen_geometry.c | 6 ++++-- source/blender/editors/screen/screen_ops.c | 6 ++++-- source/blender/editors/screen/workspace_edit.c | 6 ++++-- 7 files changed, 33 insertions(+), 18 deletions(-) (limited to 'source/blender/editors/screen') diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index f0e8fb3fa2f..c38818f3032 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -554,7 +554,8 @@ void ED_region_do_draw(bContext *C, ARegion *ar) at->draw(C, ar); } - /* XXX test: add convention to end regions always in pixel space, for drawing of borders/gestures etc */ + /* XXX test: add convention to end regions always in pixel space, + * for drawing of borders/gestures etc */ ED_region_pixelspace(ar); ED_region_draw_cb_draw(C, ar, REGION_DRAW_POST_PIXEL); @@ -2390,7 +2391,8 @@ void ED_region_panels_layout_ex( } } else if (vertical) { - /* we always keep the scroll offset - so the total view gets increased with the scrolled away part */ + /* We always keep the scroll offset - + * so the total view gets increased with the scrolled away part. */ if (v2d->cur.ymax < -FLT_EPSILON) { /* Clamp to lower view boundary */ if (v2d->tot.ymin < -v2d->winy) { @@ -2525,7 +2527,8 @@ void ED_region_header_layout(const bContext *C, ARegion *ar) int yco = buttony + (ar->winy - buttony) / 2; int maxco = xco; - /* XXX workaround for 1 px alignment issue. Not sure what causes it... Would prefer a proper fix - Julian */ + /* XXX workaround for 1 px alignment issue. Not sure what causes it... + * Would prefer a proper fix - Julian */ if (!ELEM(CTX_wm_area(C)->spacetype, SPACE_TOPBAR, SPACE_STATUSBAR)) { yco -= 1; } diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index c22d9d66251..a3273481829 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -351,7 +351,8 @@ void immDrawPixelsTexScaled_clipping(IMMDrawPixelsTexState *state, /* NOTE: Weirdly enough this is only required on macOS. Without this there is some sort of * bleeding of data is happening from tiles which are drawn later on. - * This doesn't seem to be too slow, but still would be nice to have fast and nice solution. */ + * This doesn't seem to be too slow, + * but still would be nice to have fast and nice solution. */ #ifdef __APPLE__ GPU_flush(); #endif @@ -494,7 +495,8 @@ float bglPolygonOffsetCalc(const float winmat[16], float viewdist, float dist) /* This adjustment effectively results in reducing the Z value by 0.25%. * * winmat[14] actually evaluates to `-2 * far * near / (far - near)`, - * is very close to -0.2 with default clip range, and is used as the coefficient multiplied by `w / z`, + * is very close to -0.2 with default clip range, + * and is used as the coefficient multiplied by `w / z`, * thus controlling the z dependent part of the depth value. */ return winmat[14] * -0.0025f * dist; diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index d26907cdd3f..00942a4d1b8 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -566,9 +566,10 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult } } else if (CTX_data_equals(member, "gpencil_data")) { - /* FIXME: for some reason, CTX_data_active_object(C) returns NULL when called from these situations - * (as outlined above - see Campbell's #ifdefs). That causes the get_active function to fail when - * called from context. For that reason, we end up using an alternative where we pass everything in! + /* FIXME: for some reason, CTX_data_active_object(C) returns NULL when called from these + * situations (as outlined above - see Campbell's #ifdefs). + * That causes the get_active function to fail when called from context. + * For that reason, we end up using an alternative where we pass everything in! */ bGPdata *gpd = ED_gpencil_data_get_active_direct((ID *)sc, sa, scene, obact); @@ -578,8 +579,9 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult } } else if (CTX_data_equals(member, "gpencil_data_owner")) { - /* pointer to which data/datablock owns the reference to the Grease Pencil data being used (as gpencil_data) - * XXX: see comment for gpencil_data case... + /* Pointer to which data/datablock owns the reference to the Grease Pencil data being used + * (as gpencil_data). + * XXX: see comment for gpencil_data case. */ bGPdata **gpd_ptr = NULL; PointerRNA ptr; diff --git a/source/blender/editors/screen/screen_draw.c b/source/blender/editors/screen/screen_draw.c index fb738bf40cd..6fea27a9cff 100644 --- a/source/blender/editors/screen/screen_draw.c +++ b/source/blender/editors/screen/screen_draw.c @@ -540,7 +540,8 @@ void ED_screen_draw_split_preview(ScrArea *sa, const int dir, const float fac) /* Screen Thumbnail Preview */ /** - * Calculates a scale factor to squash the preview for \a screen into a rectangle of given size and aspect. + * Calculates a scale factor to squash the preview for \a screen into a rectangle + * of given size and aspect. */ static void screen_preview_scale_get( const bScreen *screen, float size_x, float size_y, const float asp[2], float r_scale[2]) @@ -588,7 +589,8 @@ static void screen_preview_draw_areas(const bScreen *screen, static void screen_preview_draw(const bScreen *screen, int size_x, int size_y) { const float asp[2] = {1.0f, 0.8f}; /* square previews look a bit ugly */ - /* could use theme color (tui.wcol_menu_item.text), but then we'd need to regenerate all previews when changing */ + /* could use theme color (tui.wcol_menu_item.text), + * but then we'd need to regenerate all previews when changing. */ const float col[4] = {1.0f, 1.0f, 1.0f, 1.0f}; float scale[2]; diff --git a/source/blender/editors/screen/screen_geometry.c b/source/blender/editors/screen/screen_geometry.c index 18541e28ea8..a9aebca7724 100644 --- a/source/blender/editors/screen/screen_geometry.c +++ b/source/blender/editors/screen/screen_geometry.c @@ -84,7 +84,8 @@ bool screen_geom_edge_is_horizontal(ScrEdge *se) } /** - * \param bounds_rect: Either window or screen bounds. Used to exclude edges along window/screen edges. + * \param bounds_rect: Either window or screen bounds. + * Used to exclude edges along window/screen edges. */ ScrEdge *screen_geom_area_map_find_active_scredge(const ScrAreaMap *area_map, const rcti *bounds_rect, @@ -225,7 +226,8 @@ void screen_geom_vertices_scale(const wmWindow *win, bScreen *sc) } } - /* Global areas have a fixed size that only changes with the DPI. Here we ensure that exactly this size is set. */ + /* Global areas have a fixed size that only changes with the DPI. + * Here we ensure that exactly this size is set. */ for (ScrArea *area = win->global_areas.areabase.first; area; area = area->next) { if (area->global->flag & GLOBAL_AREA_IS_HIDDEN) { continue; diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 5e88af31a7c..cb2effd6657 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -4274,7 +4274,8 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv /* Recalculate the time-step for the timer now that we've finished calculating this, * since the frames-per-second value may have been changed. */ - /* TODO: this may make evaluation a bit slower if the value doesn't change... any way to avoid this? */ + /* TODO: this may make evaluation a bit slower if the value doesn't change... + * any way to avoid this? */ wt->timestep = (1.0 / FPS); return OPERATOR_FINISHED; @@ -4620,7 +4621,8 @@ static int drivers_editor_show_invoke(bContext *C, wmOperator *op, const wmEvent ANIM_set_active_channel(&ac, ac.data, ac.datatype, filter, fcu, ANIMTYPE_FCURVE); } else { - /* Just blindly isolate... This isn't the best, and shouldn't happen, but may be enough... */ + /* Just blindly isolate... + * This isn't the best, and shouldn't happen, but may be enough. */ fcu->flag |= (FCURVE_ACTIVE | FCURVE_SELECTED); } } diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c index ce64bdc27c8..6294a64af0f 100644 --- a/source/blender/editors/screen/workspace_edit.c +++ b/source/blender/editors/screen/workspace_edit.c @@ -109,7 +109,8 @@ static WorkSpaceLayout *workspace_change_get_new_layout(Main *bmain, WorkSpace *workspace_new, wmWindow *win) { - /* ED_workspace_duplicate may have stored a layout to activate once the workspace gets activated. */ + /* ED_workspace_duplicate may have stored a layout to activate + * once the workspace gets activated. */ WorkSpaceLayout *layout_old = WM_window_get_active_layout(win); WorkSpaceLayout *layout_new; bScreen *screen_new; @@ -158,7 +159,8 @@ bool ED_workspace_change(WorkSpace *workspace_new, bContext *C, wmWindowManager win->workspace_hook->temp_layout_store = NULL; if (workspace_old == workspace_new) { - /* Could also return true, everything that needs to be done was done (nothing :P), but nothing changed */ + /* Could also return true, everything that needs to be done was done (nothing :P), + * but nothing changed */ return false; } -- cgit v1.2.3