tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Merge branch 'blender-v4.0-release'

This commit is contained in:
Campbell Barton 2023-10-26 22:28:00 +11:00
parent 247491ef0f 4f0d8931f0
commit b5a9cad252
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenkernel/intern/blendfile.cc
View File

@ -800,6 +800,19 @@ static void setup_app_data(bContext *C,
wm_data_consistency_ensure(CTX_wm_manager(C), curscene, cur_view_layer);
}
if (mode == LOAD_UNDO) {
/* It's possible to undo into a time before the scene existed, in this case the window's scene
* will be null. Since it doesn't make sense to remove the window, set it to the current scene.
* NOTE: Redo will restore the active scene to the window so a reasonably consistent state
* is maintained. We could do better by keeping a window/scene map for each undo step. */
wmWindowManager *wm = static_cast<wmWindowManager *>(bfd->main->wm.first);
LISTBASE_FOREACH (wmWindow *, win, &wm->windows) {
if (win->scene == nullptr) {
win->scene = curscene;
}
}
}
BLI_assert(BKE_main_namemap_validate(bfd->main));
if (mode != LOAD_UI) {

2
source/blender/nodes/geometry/nodes/node_geo_tool_set_selection.cc
View File

@ -18,7 +18,7 @@ namespace blender::nodes::node_geo_tool_set_selection_cc {
static void node_declare(NodeDeclarationBuilder &b)
{
b.add_input<decl::Geometry>("Geometry");
b.add_input<decl::Bool>("Selection").default_value(true).hide_value().field_on_all();
b.add_input<decl::Bool>("Selection").default_value(true).field_on_all();
b.add_output<decl::Geometry>("Geometry");
}