diff options
| author | Germano Cavalcante <germano.costa@ig.com.br> | 2020-08-05 21:48:29 +0300 |
|---|---|---|
| committer | Germano Cavalcante <germano.costa@ig.com.br> | 2020-08-05 21:48:29 +0300 |
| commit | 82343037f505fb3424c962e49f4ad600fbc5ea2c (patch) | |
| tree | 3ced0ec4dca89a9590ee5471f6ede9199438c84f /source/blender/editors/transform | |
| parent | 7aec56204b12ace097f2bd45ee84114c94992764 (diff) | |
| parent | c323f3e90a4a0d15e7d9e844e0473ed62a25862f (diff) | |
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/editors/transform')
| -rw-r--r-- | source/blender/editors/transform/transform_orientations.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/transform/transform_orientations.c b/source/blender/editors/transform/transform_orientations.c index 493b52495db..e805743e6bb 100644 --- a/source/blender/editors/transform/transform_orientations.c +++ b/source/blender/editors/transform/transform_orientations.c @@ -467,14 +467,14 @@ short ED_transform_calc_orientation_from_type_ex(const bContext *C, return V3D_ORIENT_GLOBAL; } case V3D_ORIENT_GIMBAL: { - if (gimbal_axis(ob, r_mat)) { + if (ob && gimbal_axis(ob, r_mat)) { return V3D_ORIENT_GIMBAL; } /* if not gimbal, fall through to normal */ ATTR_FALLTHROUGH; } case V3D_ORIENT_NORMAL: { - if (obedit || ob->mode & OB_MODE_POSE) { + if (obedit || (ob && ob->mode & OB_MODE_POSE)) { ED_getTransformOrientationMatrix(C, r_mat, pivot_point); return V3D_ORIENT_NORMAL; } |