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

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Jesse Yurkovich
2024-07-03 17:04:55 -07:00
parent 95a335b70e 4806078dbd
commit 1d77518b58
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -482,19 +482,19 @@ static bool wm_usd_export_check(bContext * /*C*/, wmOperator *op)
static void forward_axis_update(Main * /*main*/, Scene * /*scene*/, PointerRNA *ptr)
{
int forward = RNA_enum_get(ptr, "forward_axis");
int up = RNA_enum_get(ptr, "up_axis");
int forward = RNA_enum_get(ptr, "export_global_forward_selection");
int up = RNA_enum_get(ptr, "export_global_up_selection");
if ((forward % 3) == (up % 3)) {
RNA_enum_set(ptr, "up_axis", (up + 1) % 6);
RNA_enum_set(ptr, "export_global_up_selection", (up + 1) % 6);
}
}
static void up_axis_update(Main * /*main*/, Scene * /*scene*/, PointerRNA *ptr)
{
int forward = RNA_enum_get(ptr, "forward_axis");
int up = RNA_enum_get(ptr, "up_axis");
int forward = RNA_enum_get(ptr, "export_global_forward_selection");
int up = RNA_enum_get(ptr, "export_global_up_selection");
if ((forward % 3) == (up % 3)) {
RNA_enum_set(ptr, "forward_axis", (forward + 1) % 6);
RNA_enum_set(ptr, "export_global_forward_selection", (forward + 1) % 6);
}
}