From e5784320146e1b95af59b1381bae18b08682b5d6 Mon Sep 17 00:00:00 2001 From: Kayla Man Date: Wed, 3 Jan 2024 17:42:24 +0800 Subject: [PATCH] using metric types when the unit type enabled instead of using metric types --- openpype/hosts/max/api/lib.py | 11 +++++------ openpype/settings/defaults/project_settings/max.json | 2 +- .../schemas/projects_schema/schema_project_max.json | 3 --- server_addon/max/server/settings/main.py | 5 +---- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/openpype/hosts/max/api/lib.py b/openpype/hosts/max/api/lib.py index 48b32ad6af..74b53d6426 100644 --- a/openpype/hosts/max/api/lib.py +++ b/openpype/hosts/max/api/lib.py @@ -302,8 +302,10 @@ def reset_unit_scale(): scene_scale = settings.get("unit_scale_settings", {}).get("scene_unit_scale") if scene_scale: - rt.units.SystemType = rt.Name(scene_scale) - + rt.units.DisplayType = rt.Name("Metric") + rt.units.MetricType = rt.Name(scene_scale) + else: + rt.units.DisplayType = rt.Name("Generic") def convert_unit_scale(): """Convert system unit scale in 3dsMax @@ -313,15 +315,12 @@ def convert_unit_scale(): str: unit scale """ unit_scale_dict = { - "inches": "in", - "feet": "ft", - "miles": "mi", "millimeters": "mm", "centimeters": "cm", "meters": "m", "kilometers": "km" } - current_unit_scale = rt.Execute("units.SystemType as string") + current_unit_scale = rt.Execute("units.MetricType as string") return unit_scale_dict[current_unit_scale] def set_context_setting(): diff --git a/openpype/settings/defaults/project_settings/max.json b/openpype/settings/defaults/project_settings/max.json index 1b574dc4d3..d1610610dc 100644 --- a/openpype/settings/defaults/project_settings/max.json +++ b/openpype/settings/defaults/project_settings/max.json @@ -1,7 +1,7 @@ { "unit_scale_settings": { "enabled": true, - "scene_unit_scale": "Inches" + "scene_unit_scale": "Meters" }, "imageio": { "activate_host_color_management": true, diff --git a/openpype/settings/entities/schemas/projects_schema/schema_project_max.json b/openpype/settings/entities/schemas/projects_schema/schema_project_max.json index 1df14c04e1..e4d4d40ce7 100644 --- a/openpype/settings/entities/schemas/projects_schema/schema_project_max.json +++ b/openpype/settings/entities/schemas/projects_schema/schema_project_max.json @@ -25,9 +25,6 @@ "multiselection": false, "defaults": "exr", "enum_items": [ - {"Inches": "in"}, - {"Feet": "ft"}, - {"Miles": "mi"}, {"Millimeters": "mm"}, {"Centimeters": "cm"}, {"Meters": "m"}, diff --git a/server_addon/max/server/settings/main.py b/server_addon/max/server/settings/main.py index 94dee3e55c..582226eb62 100644 --- a/server_addon/max/server/settings/main.py +++ b/server_addon/max/server/settings/main.py @@ -15,9 +15,6 @@ from .publishers import ( def unit_scale_enum(): """Return enumerator for scene unit scale.""" return [ - {"label": "in", "value": "Inches"}, - {"label": "ft", "value": "Feet"}, - {"label": "mi", "value": "Miles"}, {"label": "mm", "value": "Millimeters"}, {"label": "cm", "value": "Centimeters"}, {"label": "m", "value": "Meters"}, @@ -74,7 +71,7 @@ class MaxSettings(BaseSettingsModel): DEFAULT_VALUES = { "unit_scale_settings": { "enabled": True, - "scene_unit_scale": "cm" + "scene_unit_scale": "m" }, "RenderSettings": DEFAULT_RENDER_SETTINGS, "CreateReview": DEFAULT_CREATE_REVIEW_SETTINGS,