From 3a0593cc3d5de33248b3a7b913a45729c37dc1b4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 6 Jul 2012 22:48:28 +0000 Subject: code cleanup: dont use function calls like dot_v3v3, pow and sqrt within macros which results in calling the function multiple times needlessly. also added some comments. --- source/blender/editors/transform/transform.c | 4 ++-- source/blender/editors/transform/transform_conversions.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/transform') diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 44860258c89..35281168c2e 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -1392,8 +1392,8 @@ static void drawHelpline(bContext *UNUSED(C), int x, int y, void *customdata) float dx = t->mval[0] - cent[0], dy = t->mval[1] - cent[1]; float angle = atan2f(dy, dx); float dist = sqrtf(dx * dx + dy * dy); - float delta_angle = MIN2(15.0f / dist, (float)M_PI / 4.0f); - float spacing_angle = MIN2(5.0f / dist, (float)M_PI / 12.0f); + float delta_angle = minf(15.0f / dist, (float)M_PI / 4.0f); + float spacing_angle = minf(5.0f / dist, (float)M_PI / 12.0f); UI_ThemeColor(TH_WIRE); setlinestyle(3); diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index af0b33d58ae..d7241555cc7 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -1829,7 +1829,7 @@ static void editmesh_set_connectivity_distance(BMEditMesh *em, float mtx[][3], f d2 = d + len_v3(vec); if (dists[BM_elem_index_get(v3)] != FLT_MAX) - dists[BM_elem_index_get(v3)] = MIN2(d2, dists[BM_elem_index_get(v3)]); + dists[BM_elem_index_get(v3)] = minf(d2, dists[BM_elem_index_get(v3)]); else dists[BM_elem_index_get(v3)] = d2; -- cgit v1.2.3