blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 762 Projects 19 Wiki Activity

Cleanup: clang-format

This commit is contained in:
Campbell Barton 2021-08-26 12:27:13 +10:00
parent e5a5a251d2
commit ff85ac3009
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/draw/engines/overlay/overlay_extra.c
View File

@ -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();

6
source/blender/editors/interface/view2d_edge_pan.c
View File

@ -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)