Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2018-04-18 19:31:29 +0300
committerJulian Eisel <eiseljulian@gmail.com>2018-04-18 19:31:29 +0300
commitd7a063f166741eea06921bcde8cc2cf79620faeb (patch)
tree55e0f27f9a816230bc1a65afe708175da68f2d53 /source/blender/editors/screen/workspace_edit.c
parent39784b70e22e0760930f99f3a4b9b5061d4017fe (diff)
parentec0756af6c75ae37efb0772eecb069f3930eed46 (diff)
Merge branch 'blender2.8' into topbar
Diffstat (limited to 'source/blender/editors/screen/workspace_edit.c')
-rw-r--r--source/blender/editors/screen/workspace_edit.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/editors/screen/workspace_edit.c b/source/blender/editors/screen/workspace_edit.c
index 0c591b40b8d..c8aa4560dc4 100644
--- a/source/blender/editors/screen/workspace_edit.c
+++ b/source/blender/editors/screen/workspace_edit.c
@@ -76,12 +76,11 @@
WorkSpace *ED_workspace_add(
Main *bmain, const char *name, Scene *scene,
- ViewLayer *act_view_layer, ViewRender *view_render)
+ ViewLayer *act_view_layer)
{
WorkSpace *workspace = BKE_workspace_add(bmain, name);
BKE_workspace_view_layer_set(workspace, act_view_layer, scene);
- BKE_viewrender_copy(&workspace->view_render, view_render);
return workspace;
}
@@ -223,12 +222,7 @@ WorkSpace *ED_workspace_duplicate(
Scene *scene = WM_window_get_active_scene(win);
WorkSpace *workspace_new = ED_workspace_add(
bmain, workspace_old->id.name + 2, scene,
- BKE_workspace_view_layer_get(workspace_old, scene),
- &workspace_old->view_render);
- ListBase *transform_orientations_old = BKE_workspace_transform_orientations_get(workspace_old);
- ListBase *transform_orientations_new = BKE_workspace_transform_orientations_get(workspace_new);
-
- BLI_duplicatelist(transform_orientations_new, transform_orientations_old);
+ BKE_workspace_view_layer_get(workspace_old, scene));
workspace_new->tool = workspace_old->tool;