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

Fix: incorrect grouping of UI props for USD export

Browse Source 
Primarily the `evaluation_mode` enum prop was incorrectly grouped with
the previous `xform_op_mode` enum causing them to combine in the UI.

Additionally, group the `allow_unicode` option under the Blender Data
sub layout as was intended but got lost in a merge.

Pull Request: https://projects.blender.org/blender/blender/pulls/123513
This commit is contained in:
Jesse Yurkovich
2024-06-20 20:50:37 +02:00
committed by Jesse Yurkovich
parent a4dce75123
commit aba1a2b6c2
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/io/io_usd.cc
View File

@@ -347,18 +347,21 @@ static void wm_usd_export_draw(bContext *C, wmOperator *op)
uiItemR(row, ptr, "author_blender_name", UI_ITEM_NONE, nullptr, ICON_NONE);
uiLayoutSetActive(row, RNA_boolean_get(op->ptr, "export_custom_properties"));
# if PXR_VERSION >= 2403
uiItemR(col, ptr, "allow_unicode", UI_ITEM_NONE, nullptr, ICON_NONE);
uiItemR(sub, ptr, "allow_unicode", UI_ITEM_NONE, nullptr, ICON_NONE);
# endif
col = uiLayoutColumnWithHeading(col, true, IFACE_("File References"));
uiItemR(col, ptr, "relative_paths", UI_ITEM_NONE, nullptr, ICON_NONE);
sub = uiLayoutColumnWithHeading(col, true, IFACE_("File References"));
uiItemR(sub, ptr, "relative_paths", UI_ITEM_NONE, nullptr, ICON_NONE);
col = uiLayoutColumn(panel, false);
uiItemR(col, ptr, "convert_orientation", UI_ITEM_NONE, nullptr, ICON_NONE);
if (RNA_boolean_get(ptr, "convert_orientation")) {
uiItemR(col, ptr, "export_global_forward_selection", UI_ITEM_NONE, nullptr, ICON_NONE);
uiItemR(col, ptr, "export_global_up_selection", UI_ITEM_NONE, nullptr, ICON_NONE);
}
uiItemR(col, ptr, "xform_op_mode", UI_ITEM_NONE, nullptr, ICON_NONE);
col = uiLayoutColumn(panel, false);
uiItemR(col, ptr, "evaluation_mode", UI_ITEM_NONE, nullptr, ICON_NONE);
}