Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-08-26 05:27:13 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-08-26 05:27:13 +0300
commitff85ac300983bb1f887c071f58b47092682e165c (patch)
treece64a4228856a9cea51ea5a4f34a005791784e8b
parente5a5a251d2dcb1915c3dd37bc22d10868c04a2a6 (diff)
Cleanup: clang-format
-rw-r--r--source/blender/draw/engines/overlay/overlay_extra.c7
-rw-r--r--source/blender/editors/interface/view2d_edge_pan.c6
2 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_extra.c b/source/blender/draw/engines/overlay/overlay_extra.c
index 04d90919a20..8f9db7f6f13 100644
--- a/source/blender/draw/engines/overlay/overlay_extra.c
+++ b/source/blender/draw/engines/overlay/overlay_extra.c
@@ -861,11 +861,8 @@ typedef union OVERLAY_CameraInstanceData {
};
} OVERLAY_CameraInstanceData;
-static void camera_view3d_reconstruction(OVERLAY_ExtraCallBuffers *cb,
- Scene *scene,
- View3D *v3d,
- Object *ob,
- const float color[4])
+static void camera_view3d_reconstruction(
+ OVERLAY_ExtraCallBuffers *cb, Scene *scene, View3D *v3d, Object *ob, const float color[4])
{
const DRWContextState *draw_ctx = DRW_context_state_get();
const bool is_select = DRW_state_is_select();
diff --git a/source/blender/editors/interface/view2d_edge_pan.c b/source/blender/editors/interface/view2d_edge_pan.c
index eaf8ef30311..54e0d8f40ea 100644
--- a/source/blender/editors/interface/view2d_edge_pan.c
+++ b/source/blender/editors/interface/view2d_edge_pan.c
@@ -176,10 +176,12 @@ static float edge_pan_speed(View2DEdgePanData *vpd,
1.0f;
/* Zoom factor increases speed when zooming in and decreases speed when zooming out. */
- const float zoomx = (float)(BLI_rcti_size_x(&region->winrct) + 1) / BLI_rctf_size_x(&region->v2d.cur);
+ const float zoomx = (float)(BLI_rcti_size_x(&region->winrct) + 1) /
+ BLI_rctf_size_x(&region->v2d.cur);
const float zoom_factor = 1.0f + CLAMPIS(vpd->zoom_influence, 0.0f, 1.0f) * (zoomx - 1.0f);
- return distance_factor * delay_factor * zoom_factor * vpd->max_speed * U.widget_unit * (float)U.dpi_fac;
+ return distance_factor * delay_factor * zoom_factor * vpd->max_speed * U.widget_unit *
+ (float)U.dpi_fac;
}
static void edge_pan_apply_delta(bContext *C, View2DEdgePanData *vpd, float dx, float dy)