From ec8d277c64346770b99716b3c1bbdcd07eae26f6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 26 May 2013 18:36:25 +0000 Subject: BLI_math rename functions: - mult_m4_m4m4 -> mul_m4_m4m4 - mult_m3_m3m4 -> mul_m3_m3m4 these temporary names were used to avoid problems when argument order was switched. --- source/blender/editors/sculpt_paint/paint_image_proj.c | 4 ++-- source/blender/editors/sculpt_paint/paint_vertex.c | 8 ++++---- source/blender/editors/sculpt_paint/sculpt.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender/editors/sculpt_paint') diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index d205b3ff4f9..33da5cc5cb5 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -2930,8 +2930,8 @@ static void project_paint_begin(ProjPaintState *ps) } /* same as #ED_view3d_ob_project_mat_get */ - mult_m4_m4m4(vmat, viewmat, ps->ob->obmat); - mult_m4_m4m4(ps->projectMat, winmat, vmat); + mul_m4_m4m4(vmat, viewmat, ps->ob->obmat); + mul_m4_m4m4(ps->projectMat, winmat, vmat); } diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 5feb59c6082..4665b82eb5a 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -2249,7 +2249,7 @@ static int wpaint_stroke_test_start(bContext *C, wmOperator *op, const float UNU copy_wpaint_prev(wp, me->dvert, me->totvert); /* imat for normals */ - mult_m4_m4m4(mat, wpd->vc.rv3d->viewmat, ob->obmat); + mul_m4_m4m4(mat, wpd->vc.rv3d->viewmat, ob->obmat); invert_m4_m4(imat, mat); copy_m3_m4(wpd->wpimat, imat); @@ -2318,7 +2318,7 @@ static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P ED_view3d_init_mats_rv3d(ob, vc->rv3d); /* load projection matrix */ - mult_m4_m4m4(mat, vc->rv3d->persmat, ob->obmat); + mul_m4_m4m4(mat, vc->rv3d->persmat, ob->obmat); RNA_float_get_array(itemptr, "mouse", mval); @@ -2859,7 +2859,7 @@ static int vpaint_stroke_test_start(bContext *C, struct wmOperator *op, const fl copy_vpaint_prev(vp, (unsigned int *)me->mloopcol, me->totloop); /* some old cruft to sort out later */ - mult_m4_m4m4(mat, vpd->vc.rv3d->viewmat, ob->obmat); + mul_m4_m4m4(mat, vpd->vc.rv3d->viewmat, ob->obmat); invert_m4_m4(imat, mat); copy_m3_m4(vpd->vpimat, imat); @@ -3002,7 +3002,7 @@ static void vpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, P ED_view3d_init_mats_rv3d(ob, vc->rv3d); /* load projection matrix */ - mult_m4_m4m4(mat, vc->rv3d->persmat, ob->obmat); + mul_m4_m4m4(mat, vc->rv3d->persmat, ob->obmat); /* which faces are involved */ if (vp->flag & VP_AREA) { diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 13049aa5536..889b8b7c79c 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -1256,7 +1256,7 @@ static void calc_brush_local_mat(const Brush *brush, Object *ob, /* Scale by brush radius */ normalize_m4(mat); scale_m4_fl(scale, cache->radius); - mult_m4_m4m4(tmat, mat, scale); + mul_m4_m4m4(tmat, mat, scale); /* Return inverse (for converting from modelspace coords to local * area coords) */ @@ -2729,7 +2729,7 @@ static void do_clay_strips_brush(Sculpt *sd, Object *ob, PBVHNode **nodes, int t /* scale mat */ scale_m4_fl(scale, ss->cache->radius); - mult_m4_m4m4(tmat, mat, scale); + mul_m4_m4m4(tmat, mat, scale); invert_m4_m4(mat, tmat); #pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP) -- cgit v1.2.3