diff options
Diffstat (limited to 'source/blender/editors/mesh')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_extrude.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_knife.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/mesh/meshtools.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/mesh/editmesh_extrude.c b/source/blender/editors/mesh/editmesh_extrude.c index a83a65f2487..c1017dfce7c 100644 --- a/source/blender/editors/mesh/editmesh_extrude.c +++ b/source/blender/editors/mesh/editmesh_extrude.c @@ -165,7 +165,7 @@ static short edbm_extrude_edge(Object *obedit, BMEditMesh *em, const char hflag, if (mmd->mirror_ob) { float imtx[4][4]; invert_m4_m4(imtx, mmd->mirror_ob->obmat); - mult_m4_m4m4(mtx, imtx, obedit->obmat); + mul_m4_m4m4(mtx, imtx, obedit->obmat); } BM_ITER_MESH (edge, &iter, bm, BM_EDGES_OF_MESH) { diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 05434b76d51..d36b8fffa21 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -2900,7 +2900,7 @@ static void knife_recalc_projmat(KnifeTool_OpData *kcd) { invert_m4_m4(kcd->ob->imat, kcd->ob->obmat); ED_view3d_ob_project_mat_get(kcd->ar->regiondata, kcd->ob, kcd->projmat); - //mult_m4_m4m4(kcd->projmat, kcd->vc.rv3d->winmat, kcd->vc.rv3d->viewmat); + //mul_m4_m4m4(kcd->projmat, kcd->vc.rv3d->winmat, kcd->vc.rv3d->viewmat); kcd->is_ortho = ED_view3d_clip_range_get(kcd->vc.v3d, kcd->vc.rv3d, &kcd->clipsta, &kcd->clipend, true); diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index fb798a7e7d8..350da905015 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -3226,7 +3226,7 @@ static void sort_bmelem_flag(Scene *scene, Object *ob, float fact = reverse ? -1.0 : 1.0; int coidx = (action == SRT_VIEW_ZAXIS) ? 2 : 0; - mult_m4_m4m4(mat, rv3d->viewmat, ob->obmat); /* Apply the view matrix to the object matrix. */ + mul_m4_m4m4(mat, rv3d->viewmat, ob->obmat); /* Apply the view matrix to the object matrix. */ if (totelem[0]) { pb = pblock[0] = MEM_callocN(sizeof(char) * totelem[0], "sort_bmelem vert pblock"); diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c index 5f451a542e6..48bd96251a6 100644 --- a/source/blender/editors/mesh/meshtools.c +++ b/source/blender/editors/mesh/meshtools.c @@ -341,7 +341,7 @@ int join_mesh_exec(bContext *C, wmOperator *op) /* if this is the object we're merging into, no need to do anything */ if (base->object != ob) { /* watch this: switch matmul order really goes wrong */ - mult_m4_m4m4(cmat, imat, base->object->obmat); + mul_m4_m4m4(cmat, imat, base->object->obmat); /* transform vertex coordinates into new space */ for (a = 0, mv = mvert; a < me->totvert; a++, mv++) { |