diff options
author | Martin Poirier <theeth@yahoo.com> | 2009-08-31 01:57:10 +0400 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2009-08-31 01:57:10 +0400 |
commit | 1a968f64dcb706b90a877a1196d0b70a3c57fcff (patch) | |
tree | 2a7dbb4c245eec76e516c383fea5eb92cc22cf3c | |
parent | a7689e9b60ef6dbe720a13abddb47f5137fc222d (diff) |
Fix crash reported by DingTo with camera transform in camera view.
-rw-r--r-- | source/blender/editors/transform/transform_conversions.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_conversions.c b/source/blender/editors/transform/transform_conversions.c index aaede541b76..86d3af31c85 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -5289,7 +5289,7 @@ void createTransData(bContext *C, TransInfo *t) if (t->ar->regiontype == RGN_TYPE_WINDOW) { View3D *v3d = t->view; - RegionView3D *rv3d = t->ar->regiondata; + RegionView3D *rv3d = CTX_wm_region_view3d(C); if((t->flag & T_OBJECT) && v3d->camera == OBACT && rv3d->persp==V3D_CAMOB) { t->flag |= T_CAMERA; diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index edcbd858e37..0f715f1d35a 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1323,7 +1323,7 @@ void calculateCenter(TransInfo *t) /* voor panning from cameraview */ if(t->flag & T_OBJECT) { - if(t->spacetype==SPACE_VIEW3D) + if(t->spacetype==SPACE_VIEW3D && t->ar->regiontype == RGN_TYPE_WINDOW) { View3D *v3d = t->view; Scene *scene = t->scene; |