diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-11-26 13:53:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-11-26 13:53:26 +0400 |
| commit | 13896063bccdf97f790db5a4048514a3bf0bf0b4 (patch) | |
| tree | f65026d6a5d78c655c3f7c9e9c1cd0249d63afc4 /source/blender/blenkernel/intern/camera.c | |
| parent | 0570bdc13d297a80c702a69f72bf28f8d4e2e9b5 (diff) | |
Math library: minor additions sqrtf_signed and copy_v2_fl2
Diffstat (limited to 'source/blender/blenkernel/intern/camera.c')
| -rw-r--r-- | source/blender/blenkernel/intern/camera.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index 536ec95e3d1..ab952fb87ca 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -535,16 +535,11 @@ int BKE_camera_view_frame_fit_to_scene(Scene *scene, struct View3D *v3d, Object float plane_isect_pt_1[3], plane_isect_pt_2[3]; - /* could make a generic macro */ -#define SQRT_SIGNED(f) copysign(sqrtf(fabsf(f)), f) - /* apply the dist-from-plane's to the transformed plane points */ for (i = 0; i < 4; i++) { - mul_v3_v3fl(plane_tx[i], data_cb.normal_tx[i], SQRT_SIGNED(data_cb.dist_vals_sq[i])); + mul_v3_v3fl(plane_tx[i], data_cb.normal_tx[i], sqrtf_signed(data_cb.dist_vals_sq[i])); } -#undef SQRT_SIGNED - isect_plane_plane_v3(plane_isect_1, plane_isect_1_no, plane_tx[0], data_cb.normal_tx[0], plane_tx[2], data_cb.normal_tx[2]); |