[Bf-blender-cvs] [666be7d8860] master: Fix T69166: built-in start-up file has unnecessary screen data
Campbell Barton
noreply at git.blender.org
Tue Aug 27 11:21:11 CEST 2019
Commit: 666be7d8860b56cacd22a9e8f1a859e4611754b7
Author: Campbell Barton
Date: Tue Aug 27 19:09:49 2019 +1000
Branches: master
https://developer.blender.org/rB666be7d8860b56cacd22a9e8f1a859e4611754b7
Fix T69166: built-in start-up file has unnecessary screen data
===================================================================
M source/blender/blenloader/intern/versioning_defaults.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c
index fa69892584a..fa22fd46068 100644
--- a/source/blender/blenloader/intern/versioning_defaults.c
+++ b/source/blender/blenloader/intern/versioning_defaults.c
@@ -329,6 +329,14 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
BLI_strncpy(screen->id.name + 2, workspace->id.name + 2, sizeof(screen->id.name) - 2);
BLI_libblock_ensure_unique_name(bmain, screen->id.name);
}
+
+ /* For some reason we have unused screens, needed until re-saving.
+ * Clear unused layouts because they're visible in the outliner & Python API. */
+ LISTBASE_FOREACH_MUTABLE (WorkSpaceLayout *, layout_iter, &workspace->layouts) {
+ if (layout != layout_iter) {
+ BKE_workspace_layout_remove(bmain, workspace, layout_iter);
+ }
+ }
}
/* Scenes */
More information about the Bf-blender-cvs
mailing list