diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-05-26 22:36:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-26 22:36:25 +0400 |
commit | ec8d277c64346770b99716b3c1bbdcd07eae26f6 (patch) | |
tree | e0fc551f658e2585d0ea1c36b8d3e2c373919ef2 /source/blender/editors/sculpt_paint/sculpt.c | |
parent | 4cf069a41d0a3c39a39237656cd7e65be1d37924 (diff) |
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.
Diffstat (limited to 'source/blender/editors/sculpt_paint/sculpt.c')
-rw-r--r-- | source/blender/editors/sculpt_paint/sculpt.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) |