diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2017-06-01 21:41:18 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2017-06-01 21:46:18 +0300 |
| commit | 46fc0bb87ebda166d08b23cbcca799acb2c54158 (patch) | |
| tree | 1566d535d93c4fb81b962cdbc1346ca8242460f2 /source/blender/editors/screen | |
| parent | 7f564d74f9edaaa41ce27c6e854869096f70b4da (diff) | |
Move custom transform orientations to workspace
This commit moves the list of transform orientations from scenes to workspaces.
Main reasons for this are:
* Transform orientations are UI data and should not be stored in the scene.
* Introducion of workspaces caused some (expected) glitches with transform orientations. Mainly when removing one.
* Improves code.
More technically speaking, this commit does:
* Move list of custom transform orientations from Scene to WorkSpace struct.
* Store active transform orientation index separate from View3D.twmode (twmode can only be set to preprocessor defined values now).
* Display custom transform orientation name in header when transforming in it (used to show "global" which isn't really correct).
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/workspace_edit.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c index 3782d583003..d82b84ebede 100644 --- a/source/blender/editors/screen/workspace_edit.c +++ b/source/blender/editors/screen/workspace_edit.c @@ -216,10 +216,13 @@ WorkSpace *ED_workspace_duplicate( WorkSpace *workspace_new = ED_workspace_add( bmain, workspace_old->id.name + 2, BKE_workspace_render_layer_get(workspace_old)); + ListBase *transform_orientations_old = BKE_workspace_transform_orientations_get(workspace_old); + ListBase *transform_orientations_new = BKE_workspace_transform_orientations_get(workspace_new); #ifdef USE_WORKSPACE_MODE BKE_workspace_object_mode_set(workspace_new, BKE_workspace_object_mode_get(workspace_old)); #endif + BLI_duplicatelist(transform_orientations_new, transform_orientations_old); for (WorkSpaceLayout *layout_old = layouts_old->first; layout_old; layout_old = layout_old->next) { WorkSpaceLayout *layout_new = ED_workspace_layout_duplicate(workspace_new, layout_old, win); |