diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-08-06 13:56:14 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-08-06 13:56:14 +0400 |
| commit | 38de6d14e4e7a55a4109313942df3ae9211b1aeb (patch) | |
| tree | 83288d248bc7a4794b8b34e607f3e319e905b381 /source/blender/editors/mesh/editmesh_add.c | |
| parent | 416a3bf4a14a951642cace5ee8033c4c20dd9f66 (diff) | |
| parent | 1e4fb484001994f4e164aab7b44c9578df59f67d (diff) | |
merge with 2.5 (not trunk, last merge message said that on accident) at r22252
Diffstat (limited to 'source/blender/editors/mesh/editmesh_add.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_add.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index 806ef4c299e..ff0814661eb 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -1180,9 +1180,9 @@ static float new_primitive_matrix(bContext *C, float primmat[][4]) Mat4One(primmat); - if(rv3d) + if(rv3d && (U.flag & USER_ADD_VIEWALIGNED)) { Mat3CpyMat4(vmat, rv3d->viewmat); - else + } else Mat3One(vmat); /* inverse transform for view and object */ |