diff options
| author | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-11-19 21:34:44 +0300 |
|---|---|---|
| committer | Siddhartha Jejurkar <f20180617@goa.bits-pilani.ac.in> | 2021-11-19 21:34:44 +0300 |
| commit | 99a2af76d10e05a18987be5d554ada197b1ca086 (patch) | |
| tree | 9f9ceccccbd117c05a701b6769eb69055be6a28e /source/blender/editors/transform/transform_convert_armature.c | |
| parent | 139606bd370f96e0a8685547d515a2335591d5de (diff) | |
| parent | 50ad0e15fe0adde7335c89c6fcfa0948c341a08a (diff) | |
Merge branch 'master' into soc-2021-uv-edge-select-support
Diffstat (limited to 'source/blender/editors/transform/transform_convert_armature.c')
| -rw-r--r-- | source/blender/editors/transform/transform_convert_armature.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/transform/transform_convert_armature.c b/source/blender/editors/transform/transform_convert_armature.c index 1bbbbc6294e..88790e9645c 100644 --- a/source/blender/editors/transform/transform_convert_armature.c +++ b/source/blender/editors/transform/transform_convert_armature.c @@ -662,6 +662,12 @@ static void add_pose_transdata(TransInfo *t, bPoseChannel *pchan, Object *ob, Tr mul_m3_m3m3(td->axismtx, omat, pmat); normalize_m3(td->axismtx); + if (t->orient_type_mask & (1 << V3D_ORIENT_GIMBAL)) { + if (!gimbal_axis_pose(ob, pchan, td->ext->axismtx_gimbal)) { + copy_m3_m3(td->ext->axismtx_gimbal, td->axismtx); + } + } + if (t->mode == TFM_BONE_ENVELOPE_DIST) { td->loc = NULL; td->val = &bone->dist; |