diff options
author | Martin Poirier <theeth@yahoo.com> | 2009-03-28 23:46:38 +0300 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2009-03-28 23:46:38 +0300 |
commit | 145a44135704fa08974cac36de0a87aeb9cc696d (patch) | |
tree | de69c72ae1d644d39a6fbb0614252a229e89a591 /source/blender/editors/transform/transform_conversions.c | |
parent | a5f32714f77ed2ba7b42163fb55a3dfed6bd29af (diff) |
Correctly cancel operator is there's no transform data.
Don't access RegionView3D if region is of the wrong type.
Correctly draw extra transform stuff (like snap and pet circles) in multiple 3d regions.
Diffstat (limited to 'source/blender/editors/transform/transform_conversions.c')
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 244ba5bf434..d1991a64137 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -5013,16 +5013,18 @@ void createTransData(bContext *C, TransInfo *t) t->flag |= T_POINTS; } else { - View3D *v3d = t->view; - RegionView3D *rv3d = t->ar->regiondata; - t->flag &= ~T_PROP_EDIT; /* no proportional edit in object mode */ createTransObject(C, t); t->flag |= T_OBJECT; - if((t->flag & T_OBJECT) && v3d->camera == OBACT && rv3d->persp==V3D_CAMOB) + if (t->ar->regiontype == RGN_TYPE_WINDOW) { - t->flag |= T_CAMERA; + View3D *v3d = t->view; + RegionView3D *rv3d = t->ar->regiondata; + if((t->flag & T_OBJECT) && v3d->camera == OBACT && rv3d->persp==V3D_CAMOB) + { + t->flag |= T_CAMERA; + } } } |