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>2015-07-01 09:37:05 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-07-01 09:37:05 +0300
commit58d65dd9761aa160fad59937a6733ce611919f37 (patch)
tree8205d9dc88fe405bd9d847a473b5d2dab798f75b
parentd9046ccbd4cfc26375d852ef2ccd6edb4d6d0e6a (diff)
Cleanup: use cross_v2v2 function
-rw-r--r--source/blender/blenkernel/intern/DerivedMesh.c4
-rw-r--r--source/blender/bmesh/intern/bmesh_interp.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 22d450d5767..0f3a87b19e2 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2875,7 +2875,7 @@ void DM_calc_auto_bump_scale(DerivedMesh *dm)
while (is_degenerate == 0 && i < 4) {
float cur_edge[2], signed_area;
sub_v2_v2v2(cur_edge, tex_coords[(i + 1) & 0x3], tex_coords[i]);
- signed_area = prev_edge[0] * cur_edge[1] - prev_edge[1] * cur_edge[0];
+ signed_area = cross_v2v2(prev_edge, cur_edge);
if (i == 0) {
is_signed = (signed_area < 0.0f) ? 1 : 0;
@@ -2931,7 +2931,7 @@ void DM_calc_auto_bump_scale(DerivedMesh *dm)
sub_v2_v2v2(edge_t0, tex_coords[indices[t * 3 + 1]], tex_coords[indices[t * 3 + 0]]);
sub_v2_v2v2(edge_t1, tex_coords[indices[t * 3 + 2]], tex_coords[indices[t * 3 + 0]]);
- f2x_area_uv = fabsf(edge_t0[0] * edge_t1[1] - edge_t0[1] * edge_t1[0]);
+ f2x_area_uv = fabsf(cross_v2v2(edge_t0, edge_t1));
if (f2x_area_uv > FLT_EPSILON) {
float norm[3], v0[3], v1[3], f2x_surf_area, fsurf_ratio;
sub_v3_v3v3(v0, p1, p0);
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c
index 30ac76ab7e1..6e468bf44f2 100644
--- a/source/blender/bmesh/intern/bmesh_interp.c
+++ b/source/blender/bmesh/intern/bmesh_interp.c
@@ -407,7 +407,7 @@ static float bm_loop_flip_equotion(
b[0] = coord[i];
b[1] = coord[j];
- return mat[0][0] * mat[1][1] - mat[0][1] * mat[1][0];
+ return cross_v2v2(mat[0], mat[1]);
}
static void bm_loop_flip_disp(