diff options
author | Germano Cavalcante <germano.costa@ig.com.br> | 2021-11-23 16:17:24 +0300 |
---|---|---|
committer | Germano Cavalcante <germano.costa@ig.com.br> | 2021-11-23 16:17:24 +0300 |
commit | fecdf9d44bd130a9ca08546f395f4b1849c4804d (patch) | |
tree | 5764047360e7f9c0e19d37018c623094d833f27d /source/blender/editors/transform | |
parent | a6d1a2d3fc1f5170755142b3657218edc2c223ef (diff) | |
parent | b7c98c87ace46ae5967d223320bcbfc746218c26 (diff) |
Merge branch 'blender-v3.0-release'
Conflicts:
source/blender/editors/transform/transform_generics.c
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 47 |
1 files changed, 27 insertions, 20 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index ece6a143251..c911331404f 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -158,27 +158,34 @@ static int t_around_get(TransInfo *t) } ScrArea *area = t->area; - if (t->spacetype == SPACE_VIEW3D) { - /* Bend always uses the cursor. */ - if (t->mode == TFM_BEND) { - return V3D_AROUND_CURSOR; + switch (t->spacetype) { + case SPACE_VIEW3D: { + if (t->mode == TFM_BEND) { + /* Bend always uses the cursor. */ + return V3D_AROUND_CURSOR; + } + return t->settings->transform_pivot_point; } - return t->settings->transform_pivot_point; - } - if (t->spacetype == SPACE_IMAGE) { - SpaceImage *sima = area->spacedata.first; - return sima->around; - } - if (t->spacetype == SPACE_GRAPH) { - SpaceGraph *sipo = area->spacedata.first; - return sipo->around; - } - if (t->spacetype == SPACE_CLIP) { - SpaceClip *sclip = area->spacedata.first; - return sclip->around; - } - if (t->spacetype == SPACE_SEQ && t->region->regiontype == RGN_TYPE_PREVIEW) { - return SEQ_tool_settings_pivot_point_get(t->scene); + case SPACE_IMAGE: { + SpaceImage *sima = area->spacedata.first; + return sima->around; + } + case SPACE_GRAPH: { + SpaceGraph *sipo = area->spacedata.first; + return sipo->around; + } + case SPACE_CLIP: { + SpaceClip *sclip = area->spacedata.first; + return sclip->around; + } + case SPACE_SEQ: { + if (t->region->regiontype == RGN_TYPE_PREVIEW) { + return SEQ_tool_settings_pivot_point_get(t->scene); + } + break; + } + default: + break; } return V3D_AROUND_CENTER_BOUNDS; |