diff options
Diffstat (limited to 'source/blender/editors')
24 files changed, 49 insertions, 49 deletions
diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index 3a4dc31c82d..7ed7ebbb4b9 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -209,7 +209,7 @@ int join_armature_exec(bContext *C, wmOperator *UNUSED(op)) /* Find the difference matrix */ invert_m4_m4(oimat, ob->obmat); - mult_m4_m4m4(mat, oimat, base->object->obmat); + mul_m4_m4m4(mat, oimat, base->object->obmat); /* Copy bones and posechannels from the object to the edit armature */ for (pchan = opose->chanbase.first; pchan; pchan = pchann) { @@ -245,7 +245,7 @@ int join_armature_exec(bContext *C, wmOperator *UNUSED(op)) /* Find the roll */ invert_m4_m4(imat, premat); - mult_m4_m4m4(difmat, imat, postmat); + mul_m4_m4m4(difmat, imat, postmat); curbone->roll -= (float)atan2(difmat[2][0], difmat[2][2]); } diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 0bc00206d93..60e107b9c15 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -6088,7 +6088,7 @@ int join_curve_exec(bContext *C, wmOperator *UNUSED(op)) if (cu->nurb.first) { /* watch it: switch order here really goes wrong */ - mult_m4_m4m4(cmat, imat, base->object->obmat); + mul_m4_m4m4(cmat, imat, base->object->obmat); nu = cu->nurb.first; while (nu) { 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++) { diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 2ba5fb24292..8af9401e30f 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -773,7 +773,7 @@ static void child_get_inverse_matrix(Scene *scene, Object *ob, bConstraint *con, * the effect of the constraint */ invert_m4_m4(imat, pchan->pose_mat); - mult_m4_m4m4(tmat, pmat, imat); + mul_m4_m4m4(tmat, pmat, imat); invert_m4_m4(invmat, tmat); /* 5. restore constraints */ diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 69ad3f3225f..861dd4003e1 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -703,7 +703,7 @@ static int object_hook_reset_exec(bContext *C, wmOperator *op) float imat[4][4], mat[4][4]; /* calculate the world-space matrix for the pose-channel target first, then carry on as usual */ - mult_m4_m4m4(mat, hmd->object->obmat, pchan->pose_mat); + mul_m4_m4m4(mat, hmd->object->obmat, pchan->pose_mat); invert_m4_m4(imat, mat); mul_serie_m4(hmd->parentinv, imat, ob->obmat, NULL, NULL, NULL, NULL, NULL, NULL); diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 9e3f4a66e4d..02481ec5222 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -618,7 +618,7 @@ static bool ed_vgroup_transfer_weight(Object *ob_dst, Object *ob_src, bDeformGro /* Prepare transformation matrix.*/ invert_m4_m4(ob_src->imat, ob_src->obmat); - mult_m4_m4m4(tmp_mat, ob_src->imat, ob_dst->obmat); + mul_m4_m4m4(tmp_mat, ob_src->imat, ob_dst->obmat); /* Clear weights.*/ if (replace_mode == WT_REPLACE_ALL_WEIGHTS) { 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) diff --git a/source/blender/editors/space_clip/tracking_ops.c b/source/blender/editors/space_clip/tracking_ops.c index ffa4ee2a1d8..756492ea0f0 100644 --- a/source/blender/editors/space_clip/tracking_ops.c +++ b/source/blender/editors/space_clip/tracking_ops.c @@ -1904,7 +1904,7 @@ static void object_solver_inverted_matrix(Scene *scene, Object *ob, float invmat BKE_object_where_is_calc_mat4(scene, cam, invmat); } - mult_m4_m4m4(invmat, invmat, data->invmat); + mul_m4_m4m4(invmat, invmat, data->invmat); found = TRUE; } @@ -2108,7 +2108,7 @@ static void set_axis(Scene *scene, Object *ob, MovieClip *clip, MovieTrackingOb if (is_camera) { invert_m4(mat); - mult_m4_m4m4(mat, mat, obmat); + mul_m4_m4m4(mat, mat, obmat); } else { if (!flip) { @@ -2125,7 +2125,7 @@ static void set_axis(Scene *scene, Object *ob, MovieClip *clip, MovieTrackingOb mul_serie_m4(mat, lmat, mat, ilmat, obmat, NULL, NULL, NULL, NULL); } else { - mult_m4_m4m4(mat, obmat, mat); + mul_m4_m4m4(mat, obmat, mat); } } @@ -2217,14 +2217,14 @@ static int set_plane_exec(bContext *C, wmOperator *op) invert_m4(mat); BKE_object_to_mat4(object, obmat); - mult_m4_m4m4(mat, mat, obmat); - mult_m4_m4m4(newmat, rot, mat); + mul_m4_m4m4(mat, mat, obmat); + mul_m4_m4m4(newmat, rot, mat); BKE_object_apply_mat4(object, newmat, 0, 0); /* make camera have positive z-coordinate */ if (object->loc[2] < 0) { invert_m4(rot); - mult_m4_m4m4(newmat, rot, mat); + mul_m4_m4m4(newmat, rot, mat); BKE_object_apply_mat4(object, newmat, 0, 0); } } diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 9517dae762a..54231808e75 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -2189,7 +2189,7 @@ static void draw_dm_verts(BMEditMesh *em, DerivedMesh *dm, int sel, BMVert *eve_ /* For skin root drawing */ data.has_vskin = CustomData_has_layer(&em->bm->vdata, CD_MVERT_SKIN); /* view-aligned matrix */ - mult_m4_m4m4(data.imat, rv3d->viewmat, em->ob->obmat); + mul_m4_m4m4(data.imat, rv3d->viewmat, em->ob->obmat); invert_m4(data.imat); bglBegin(GL_POINTS); @@ -4251,7 +4251,7 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv if ((base->flag & OB_FROMDUPLI) && (ob->flag & OB_FROMGROUP)) { float mat[4][4]; - mult_m4_m4m4(mat, ob->obmat, psys->imat); + mul_m4_m4m4(mat, ob->obmat, psys->imat); glMultMatrixf(mat); } diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 363eea480b9..4c888f2f6c6 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -226,8 +226,8 @@ bool ED_view3d_context_user_region(bContext *C, View3D **r_v3d, ARegion **r_ar) void ED_view3d_init_mats_rv3d(struct Object *ob, struct RegionView3D *rv3d) { /* local viewmat and persmat, to calculate projections */ - mult_m4_m4m4(rv3d->viewmatob, rv3d->viewmat, ob->obmat); - mult_m4_m4m4(rv3d->persmatob, rv3d->persmat, ob->obmat); + mul_m4_m4m4(rv3d->viewmatob, rv3d->viewmat, ob->obmat); + mul_m4_m4m4(rv3d->persmatob, rv3d->persmat, ob->obmat); /* initializes object space clipping, speeds up clip tests */ ED_view3d_clipping_local(rv3d, ob->obmat); diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index e8b480c1f23..8dbaabb0440 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2238,7 +2238,7 @@ void draw_depth_gpencil(Scene *scene, ARegion *ar, View3D *v3d) setwinmatrixview3d(ar, v3d, NULL); setviewmatrixview3d(scene, v3d, rv3d); /* note: calls BKE_object_where_is_calc for camera... */ - mult_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); + mul_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); invert_m4_m4(rv3d->persinv, rv3d->persmat); invert_m4_m4(rv3d->viewinv, rv3d->viewmat); @@ -2275,7 +2275,7 @@ void draw_depth(Scene *scene, ARegion *ar, View3D *v3d, int (*func)(void *), boo setwinmatrixview3d(ar, v3d, NULL); setviewmatrixview3d(scene, v3d, rv3d); /* note: calls BKE_object_where_is_calc for camera... */ - mult_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); + mul_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); invert_m4_m4(rv3d->persinv, rv3d->persmat); invert_m4_m4(rv3d->viewinv, rv3d->viewmat); @@ -2467,7 +2467,7 @@ static void gpu_update_lamps_shadows(Scene *scene, View3D *v3d) copy_m4_m4(rv3d.winmat, winmat); copy_m4_m4(rv3d.viewmat, viewmat); invert_m4_m4(rv3d.viewinv, rv3d.viewmat); - mult_m4_m4m4(rv3d.persmat, rv3d.winmat, rv3d.viewmat); + mul_m4_m4m4(rv3d.persmat, rv3d.winmat, rv3d.viewmat); invert_m4_m4(rv3d.persinv, rv3d.viewinv); /* no need to call ED_view3d_draw_offscreen_init since shadow buffers were already updated */ @@ -2540,7 +2540,7 @@ void ED_view3d_update_viewmat(Scene *scene, View3D *v3d, ARegion *ar, float view setviewmatrixview3d(scene, v3d, rv3d); /* note: calls BKE_object_where_is_calc for camera... */ /* update utilitity matrices */ - mult_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); + mul_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); invert_m4_m4(rv3d->persinv, rv3d->persmat); invert_m4_m4(rv3d->viewinv, rv3d->viewmat); @@ -2840,7 +2840,7 @@ ImBuf *ED_view3d_draw_offscreen_imbuf_simple(Scene *scene, Object *camera, int w v3d.lens = params.lens; } - mult_m4_m4m4(rv3d.persmat, rv3d.winmat, rv3d.viewmat); + mul_m4_m4m4(rv3d.persmat, rv3d.winmat, rv3d.viewmat); invert_m4_m4(rv3d.persinv, rv3d.viewinv); return ED_view3d_draw_offscreen_imbuf(scene, &v3d, &ar, width, height, flag, diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 4154318e979..378bb181b35 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -145,9 +145,9 @@ bool ED_view3d_camera_lock_sync(View3D *v3d, RegionView3D *rv3d) ED_view3d_to_m4(view_mat, rv3d->ofs, rv3d->viewquat, rv3d->dist); invert_m4_m4(v3d->camera->imat, v3d->camera->obmat); - mult_m4_m4m4(diff_mat, view_mat, v3d->camera->imat); + mul_m4_m4m4(diff_mat, view_mat, v3d->camera->imat); - mult_m4_m4m4(parent_mat, diff_mat, root_parent->obmat); + mul_m4_m4m4(parent_mat, diff_mat, root_parent->obmat); BKE_object_tfm_protected_backup(root_parent, &obtfm); BKE_object_apply_mat4(root_parent, parent_mat, true, false); diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 4c267905834..5957f743665 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -740,11 +740,11 @@ static void flyMoveCamera(bContext *C, RegionView3D *rv3d, FlyInfo *fly, ED_view3d_to_m4(prev_view_mat, fly->rv3d->ofs, fly->rv3d->viewquat, fly->rv3d->dist); invert_m4_m4(prev_view_imat, prev_view_mat); ED_view3d_to_m4(view_mat, rv3d->ofs, rv3d->viewquat, rv3d->dist); - mult_m4_m4m4(diff_mat, view_mat, prev_view_imat); - mult_m4_m4m4(parent_mat, diff_mat, fly->root_parent->obmat); + mul_m4_m4m4(diff_mat, view_mat, prev_view_imat); + mul_m4_m4m4(parent_mat, diff_mat, fly->root_parent->obmat); size_to_mat4(size_mat, fly->root_parent->size); - mult_m4_m4m4(parent_mat, parent_mat, size_mat); + mul_m4_m4m4(parent_mat, parent_mat, size_mat); BKE_object_apply_mat4(fly->root_parent, parent_mat, true, false); @@ -764,7 +764,7 @@ static void flyMoveCamera(bContext *C, RegionView3D *rv3d, FlyInfo *fly, ED_view3d_to_m4(view_mat, rv3d->ofs, rv3d->viewquat, rv3d->dist); size_to_mat4(size_mat, v3d->camera->size); - mult_m4_m4m4(view_mat, view_mat, size_mat); + mul_m4_m4m4(view_mat, view_mat, size_mat); BKE_object_apply_mat4(v3d->camera, view_mat, true, false); diff --git a/source/blender/editors/space_view3d/view3d_project.c b/source/blender/editors/space_view3d/view3d_project.c index 00826d277bd..6a0701331cc 100644 --- a/source/blender/editors/space_view3d/view3d_project.c +++ b/source/blender/editors/space_view3d/view3d_project.c @@ -546,8 +546,8 @@ void ED_view3d_ob_project_mat_get(const RegionView3D *rv3d, Object *ob, float pm { float vmat[4][4]; - mult_m4_m4m4(vmat, (float (*)[4])rv3d->viewmat, ob->obmat); - mult_m4_m4m4(pmat, (float (*)[4])rv3d->winmat, vmat); + mul_m4_m4m4(vmat, (float (*)[4])rv3d->viewmat, ob->obmat); + mul_m4_m4m4(pmat, (float (*)[4])rv3d->winmat, vmat); } /** diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 2a1e6d0fc5c..5a79b0dad41 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -116,7 +116,7 @@ void view3d_get_transformation(const ARegion *ar, RegionView3D *rv3d, Object *ob int i, j; if (ob) { - mult_m4_m4m4(cpy, rv3d->viewmat, ob->obmat); + mul_m4_m4m4(cpy, rv3d->viewmat, ob->obmat); } else { copy_m4_m4(cpy, rv3d->viewmat); diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c index 64ac4129dd4..c864a3a78b4 100644 --- a/source/blender/editors/space_view3d/view3d_snap.c +++ b/source/blender/editors/space_view3d/view3d_snap.c @@ -862,7 +862,7 @@ static void bundle_midpoint(Scene *scene, Object *ob, float vec[3]) BKE_tracking_camera_get_reconstructed_interpolate(tracking, object, scene->r.cfra, imat); invert_m4(imat); - mult_m4_m4m4(obmat, cammat, imat); + mul_m4_m4m4(obmat, cammat, imat); } while (track) { diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index 0728e3a4d93..15641f35b35 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -622,7 +622,7 @@ bool ED_view3d_boundbox_clip(RegionView3D *rv3d, float obmat[4][4], const BoundB if (bb == NULL) return true; if (bb->flag & OB_BB_DISABLED) return true; - mult_m4_m4m4(mat, rv3d->persmat, obmat); + mul_m4_m4m4(mat, rv3d->persmat, obmat); for (a = 0; a < 8; a++) { copy_v3_v3(vec, bb->vec[a]); @@ -905,7 +905,7 @@ short view3d_opengl_select(ViewContext *vc, unsigned int *buffer, unsigned int b } setwinmatrixview3d(ar, v3d, &rect); - mult_m4_m4m4(vc->rv3d->persmat, vc->rv3d->winmat, vc->rv3d->viewmat); + mul_m4_m4m4(vc->rv3d->persmat, vc->rv3d->winmat, vc->rv3d->viewmat); if (v3d->drawtype > OB_WIRE) { v3d->zbuf = TRUE; @@ -983,7 +983,7 @@ short view3d_opengl_select(ViewContext *vc, unsigned int *buffer, unsigned int b G.f &= ~G_PICKSEL; setwinmatrixview3d(ar, v3d, NULL); - mult_m4_m4m4(vc->rv3d->persmat, vc->rv3d->winmat, vc->rv3d->viewmat); + mul_m4_m4m4(vc->rv3d->persmat, vc->rv3d->winmat, vc->rv3d->viewmat); if (v3d->drawtype > OB_WIRE) { v3d->zbuf = 0; diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index a32a6b031b8..ad1661f6e36 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -166,7 +166,7 @@ static void clipMirrorModifier(TransInfo *t, Object *ob) float obinv[4][4]; invert_m4_m4(obinv, mmd->mirror_ob->obmat); - mult_m4_m4m4(mtx, obinv, ob->obmat); + mul_m4_m4m4(mtx, obinv, ob->obmat); invert_m4_m4(imtx, mtx); } diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 18ad9402116..f336fc4651b 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -1682,7 +1682,7 @@ static int manipulator_selectbuf(ScrArea *sa, ARegion *ar, const int mval[2], fl rect.ymax = mval[1] + hotspot; setwinmatrixview3d(ar, v3d, &rect); - mult_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); + mul_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); glSelectBuffer(64, buffer); glRenderMode(GL_SELECT); @@ -1704,7 +1704,7 @@ static int manipulator_selectbuf(ScrArea *sa, ARegion *ar, const int mval[2], fl G.f &= ~G_PICKSEL; setwinmatrixview3d(ar, v3d, NULL); - mult_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); + mul_m4_m4m4(rv3d->persmat, rv3d->winmat, rv3d->viewmat); if (hits == 1) return buffer[3]; else if (hits > 1) { |