diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-06 20:02:46 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-06 20:02:46 +0300 |
| commit | 91af8f2ae2b5238839b57eaf74b0f950259ec57a (patch) | |
| tree | 1e7e775c9830041457cbb5771804b8bddfbeee3a /source/blender/blenloader | |
| parent | 9d77b5d5910b65bed88817169d5444cfb189eb63 (diff) | |
| parent | 66a6d160fe26c1bac7a5dd4cd26cb5fbd5cf348e (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/device/device.cpp
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_outliner/outliner_edit.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/util/ed_util.c
source/blender/windowmanager/intern/wm_files_link.c
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index ccf2dc1f4c4..e6ab8fa883b 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2807,7 +2807,7 @@ static void lib_link_workspaces(FileData *fd, Main *bmain) if (screen) { BKE_workspace_layout_screen_set(layout, screen); - if (ID_IS_LINKED_DATABLOCK(id)) { + if (ID_IS_LINKED(id)) { screen->winid = 0; if (screen->temp) { /* delete temp layouts when appending */ @@ -2835,7 +2835,7 @@ static void direct_link_workspace(FileData *fd, WorkSpace *workspace, const Main relation->value = newdataadr(fd, relation->value); } - if (ID_IS_LINKED_DATABLOCK(&workspace->id)) { + if (ID_IS_LINKED(&workspace->id)) { /* Appending workspace so render layer is likely from a different scene. Unset * now, when activating workspace later we set a valid one from current scene. */ BKE_workspace_render_layer_set(workspace, NULL); |