diff options
| author | Martin Poirier <theeth@yahoo.com> | 2009-12-02 22:59:57 +0300 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2009-12-02 22:59:57 +0300 |
| commit | 63fc267929e64cd8ab09d35cae12a172d3e218f3 (patch) | |
| tree | dbc7e445a839e4a5c5f7dd27acd7176ee1b97cfd /source/blender/editors | |
| parent | bce687ef36de6898a59fa547af0b3c851e35a9d3 (diff) | |
[#20213] Align to Transform Orientation crashes Blender
Align needs to be call with region context.
Also added checks to prevent this from crashing if not called properly.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_generics.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index cbcb3953f49..ffc6ea86835 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -126,7 +126,7 @@ void setTransformViewMatrices(TransInfo *t) { - if(t->spacetype==SPACE_VIEW3D && t->ar->regiontype == RGN_TYPE_WINDOW) { + if(t->spacetype==SPACE_VIEW3D && t->ar && t->ar->regiontype == RGN_TYPE_WINDOW) { RegionView3D *rv3d = t->ar->regiondata; copy_m4_m4(t->viewmat, rv3d->viewmat); diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 71a5affb573..c9b5b17091e 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1357,7 +1357,7 @@ void calculateCenter(TransInfo *t) /* for panning from cameraview */ if(t->flag & T_OBJECT) { - if(t->spacetype==SPACE_VIEW3D && t->ar->regiontype == RGN_TYPE_WINDOW) + if(t->spacetype==SPACE_VIEW3D && t->ar && t->ar->regiontype == RGN_TYPE_WINDOW) { View3D *v3d = t->view; Scene *scene = t->scene; |