diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-30 14:58:36 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-30 14:58:36 +0400 |
| commit | 76e989d7b1303c877e8469513eae4ed746a8efe5 (patch) | |
| tree | c67376b4919e0f3981ff11101164e76869a2832c /source/blender/bmesh/operators/bmo_connect_pair.c | |
| parent | 298a03ee634d2ef7eef0d4a7f1c23c7df7593a4c (diff) | |
function renaming for own recently added BLI_math functions, suggested by Brecht.
Diffstat (limited to 'source/blender/bmesh/operators/bmo_connect_pair.c')
| -rw-r--r-- | source/blender/bmesh/operators/bmo_connect_pair.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/bmesh/operators/bmo_connect_pair.c b/source/blender/bmesh/operators/bmo_connect_pair.c index fb9ebe31c62..0bc29c56256 100644 --- a/source/blender/bmesh/operators/bmo_connect_pair.c +++ b/source/blender/bmesh/operators/bmo_connect_pair.c @@ -87,8 +87,8 @@ typedef struct PathLinkState { static int state_isect_co_pair(const PathContext *pc, const float co_a[3], const float co_b[3]) { - const float diff_a = mul_m3_v3_single_x((float (*)[3])pc->matrix, co_a) - pc->axis_sep; - const float diff_b = mul_m3_v3_single_x((float (*)[3])pc->matrix, co_b) - pc->axis_sep; + const float diff_a = dot_m3_v3_row_x((float (*)[3])pc->matrix, co_a) - pc->axis_sep; + const float diff_b = dot_m3_v3_row_x((float (*)[3])pc->matrix, co_b) - pc->axis_sep; const int test_a = (fabsf(diff_a) < CONNECT_EPS) ? 0 : (diff_a < 0.0f) ? -1 : 1; const int test_b = (fabsf(diff_b) < CONNECT_EPS) ? 0 : (diff_b < 0.0f) ? -1 : 1; @@ -104,7 +104,7 @@ static int state_isect_co_pair(const PathContext *pc, static int state_isect_co_exact(const PathContext *pc, const float co[3]) { - const float diff = mul_m3_v3_single_x((float (*)[3])pc->matrix, co) - pc->axis_sep; + const float diff = dot_m3_v3_row_x((float (*)[3])pc->matrix, co) - pc->axis_sep; return (fabsf(diff) <= CONNECT_EPS); } @@ -113,8 +113,8 @@ static float state_calc_co_pair_fac(const PathContext *pc, { float diff_a, diff_b, diff_tot; - diff_a = fabsf(mul_m3_v3_single_x((float (*)[3])pc->matrix, co_a) - pc->axis_sep); - diff_b = fabsf(mul_m3_v3_single_x((float (*)[3])pc->matrix, co_b) - pc->axis_sep); + diff_a = fabsf(dot_m3_v3_row_x((float (*)[3])pc->matrix, co_a) - pc->axis_sep); + diff_b = fabsf(dot_m3_v3_row_x((float (*)[3])pc->matrix, co_b) - pc->axis_sep); diff_tot = (diff_a + diff_b); return (diff_tot > FLT_EPSILON) ? (diff_a / diff_tot) : 0.5f; } @@ -437,7 +437,7 @@ void bmo_connect_vert_pair_exec(BMesh *bm, BMOperator *op) normalize_v3_v3(pc.matrix[2], basis_nor); invert_m3(pc.matrix); - pc.axis_sep = mul_m3_v3_single_x(pc.matrix, pc.v_a->co); + pc.axis_sep = dot_m3_v3_row_x(pc.matrix, pc.v_a->co); } /* add first vertex */ |