diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-03-08 10:15:41 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-03-08 10:15:41 +0300 |
| commit | 0c5032ebf3124edce9d19bc0464ef1b3d4a04828 (patch) | |
| tree | 824a4dfae826be70e0358f67e252f622f2b958dd /source/blender/editors/mesh/editmesh_add.c | |
| parent | 57c37cf10c4037ab66b06802169a7b2008e51013 (diff) | |
| parent | d0267ccf6dffa0b7dafa85f6db8ff03251dbb8df (diff) | |
merge with 2.5 at 19207, plus some half-finished walker stuff
Diffstat (limited to 'source/blender/editors/mesh/editmesh_add.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_add.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index b2b6e855bbd..8651abac0a9 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -1280,13 +1280,13 @@ static float new_primitive_matrix(bContext *C, float primmat[][4]) Object *obedit= CTX_data_edit_object(C); Scene *scene = CTX_data_scene(C); View3D *v3d =CTX_wm_view3d(C); - ARegion *ar= CTX_wm_region(C); + RegionView3D *rv3d= CTX_wm_region_view3d(C); float *curs, mat[3][3], vmat[3][3], cmat[3][3], imat[3][3]; Mat4One(primmat); - if(ar) - Mat3CpyMat4(vmat, ((RegionView3D *)ar->regiondata)->viewmat); + if(rv3d) + Mat3CpyMat4(vmat, rv3d->viewmat); else Mat3One(vmat); |