diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-17 03:50:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-17 03:50:55 +0400 |
| commit | db6cb30941da7899ccafa44c87c17970d134a2c9 (patch) | |
| tree | 0f1c3df62346cfac61e2785e9ec7ac8e0e30f443 /source/blender/editors/space_view3d/view3d_select.c | |
| parent | e5b1f9c28d52254fd11e226ed4ac7bf07d7259d7 (diff) | |
| parent | 3311164b24da61f2967f96d0ee27508a7e2e0267 (diff) | |
svn merge ^/trunk/blender -r42669:42670
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_select.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_select.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 23874ea47b0..9a63d591953 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -142,7 +142,7 @@ void view3d_get_transformation(ARegion *ar, RegionView3D *rv3d, Object *ob, bglM int i, j; if (ob) { - mul_m4_m4m4(cpy, ob->obmat, rv3d->viewmat); + mult_m4_m4m4(cpy, rv3d->viewmat, ob->obmat); } else { copy_m4_m4(cpy, rv3d->viewmat); } |