griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.4-release'

Browse Source
This commit is contained in:
Jesse Yurkovich
2025-02-27 16:48:42 -08:00
parent c7fd8d5ad1 1833d79231
commit ea5ed269ae
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/io/usd/intern/usd_writer_mesh.cc
View File

@@ -157,7 +157,7 @@ void USDGenericMeshWriter::write_custom_data(const Object *obj,
* Skip edge domain because USD doesn't have a good conversion for them. */
if (iter.name[0] == '.' || bke::attribute_name_is_anonymous(iter.name) ||
iter.domain == bke::AttrDomain::Edge ||
ELEM(iter.name, "position", "material_index", "velocity", "crease_vert"))
ELEM(iter.name, "position", "material_index", "velocity", "crease_vert", "custom_normal"))
{
return;
}

14
source/blender/windowmanager/intern/wm_event_system.cc
View File

@@ -2920,12 +2920,14 @@ static eHandlerActionFlag wm_handler_fileselect_do(bContext *C,
}
/* XXX check this carefully, `CTX_wm_manager(C) == wm` is a bit hackish. */
if (CTX_wm_manager(C) == wm && wm->op_undo_depth == 0) {
if (handler->op->type->flag & OPTYPE_UNDO) {
ED_undo_push_op(C, handler->op);
}
else if (handler->op->type->flag & OPTYPE_UNDO_GROUPED) {
ED_undo_grouped_push_op(C, handler->op);
if (retval & OPERATOR_FINISHED) {
if (CTX_wm_manager(C) == wm && wm->op_undo_depth == 0) {
if (handler->op->type->flag & OPTYPE_UNDO) {
ED_undo_push_op(C, handler->op);
}
else if (handler->op->type->flag & OPTYPE_UNDO_GROUPED) {
ED_undo_grouped_push_op(C, handler->op);
}
}
}