Skip to content

Commit 851ef66

Browse files
authored
Merge pull request #231 from Unity-Technologies/UNI-31483-sprint35-release
UNI-31483 sprint 35 release
2 parents e2e0a0b + 90301fc commit 851ef66

File tree

6 files changed

+52
-18
lines changed

6 files changed

+52
-18
lines changed

Assets/FbxExporters/Editor/FbxExportSettings.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,10 +294,10 @@ public static string[] DCCVendorLocations {
294294
}
295295

296296
// Note: default values are set in LoadDefaults().
297-
public bool mayaCompatibleNames;
298-
public bool centerObjects;
299-
public bool launchAfterInstallation;
300-
public bool HideSendToUnityMenu;
297+
public bool mayaCompatibleNames = true;
298+
public bool centerObjects = true;
299+
public bool launchAfterInstallation = true;
300+
public bool HideSendToUnityMenu = true;
301301
public int ExportFormatSelection;
302302

303303
public string IntegrationSavePath;

Assets/FbxExporters/Editor/FbxExporter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,6 @@ protected bool ExportCamera (GameObject unityGO, FbxScene fbxScene, FbxNode fbxN
807807
unityCamera.orthographic ? FbxCamera.EProjectionType.eOrthogonal : FbxCamera.EProjectionType.ePerspective;
808808

809809
fbxCamera.ProjectionType.Set(projectionType);
810-
fbxCamera.SetAspect (FbxCamera.EAspectRatioMode.eFixedRatio, aspectRatio, 1.0f);
811810
fbxCamera.FilmAspectRatio.Set(aspectRatio);
812811
fbxCamera.SetApertureWidth (apertureWidthInInches);
813812
fbxCamera.SetApertureHeight (apertureHeightInInches);

Assets/Integrations/Autodesk/maya/scripts/unityCommands.mel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ proc int loadUnityDependencies(){
7878
}
7979

8080
$removeSendToUnityMenu = `optionVar -q "UnityFbxForMaya_removeSendToUnityMenu"`;
81-
if($removeSendToUnityMenu){
81+
if($removeSendToUnityMenu && `menu -exists "sendToUnityMenu"`){
8282
//Remove the GamePipeline 'SendToUnity' button
8383
menu -e -visible false "sendToUnityMenu";
8484
}

Assets/Integrations/Autodesk/maya/scripts/unitySetupUI.mel

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ global string $unityImportIconPath = "import.png";
77
global string $unityExportIconPath = "export.png";
88
global string $unityIconPath = "unity.png";
99

10-
global string $unityPluginVersion = "{Version}";
11-
global string $unityFamilyLabel = "The UnityFbxForMaya plugin allows you to reliably exchange and review your work between Maya and Unity.";
10+
global string $unityFamilyLabel = "The UnityFbxForMaya plugin (v.{Version}) allows you to reliably exchange and review your work between Maya and Unity.";
1211
global string $unityImportLabel = "Import an FBX file from a Unity project and auto-configure for exporting";
1312
global string $unityExportLabel = "Export Model to Unity";
1413

@@ -36,11 +35,6 @@ global proc unitySetupUI(){
3635
evalDeferred -lowestPriority "unityInstallUI";
3736
}
3837

39-
global proc string unitySetLabelVersion(string $label){
40-
global string $unityPluginVersion;
41-
return `format -stringArg $label -stringArg $unityPluginVersion "^1s (v.^2s)"`;
42-
}
43-
4438
global proc unityInstallUI(){
4539
global string $unityMenuName;
4640
global string $unityMenuDivider;
@@ -66,9 +60,6 @@ global proc unityInstallUI(){
6660

6761
global string $gMainFileMenu;
6862

69-
// update family label with version
70-
$unityFamilyLabel = unitySetLabelVersion($unityFamilyLabel);
71-
7263
buildFileMenu;
7364
$parentMenu = $gMainFileMenu;
7465
$pluginVersion = unityWhatsNewVersion();
@@ -79,7 +70,7 @@ global proc unityInstallUI(){
7970
menuItem -parent $unityMenuName -label $unityExportMenuName -version $pluginVersion -image $unityExportIconPath -annotation $unityExportLabel -command $unityExportCommand;
8071

8172
$unityRemoveSendToUnityMenuOption = `optionVar -q $unityRemoveSendToUnityMenuOption`;
82-
if($unityRemoveSendToUnityMenuOption){
73+
if($unityRemoveSendToUnityMenuOption && `menu -exists $unitySendToUnityMenuName`){
8374
menu -e -visible false $unitySendToUnityMenuName;
8475
}
8576

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ endif()
2323
message(STATUS "Building for ${CMAKE_BUILD_TYPE}")
2424

2525
if (NOT DEFINED PACKAGE_VERSION OR "${PACKAGE_VERSION}" STREQUAL "")
26-
set(PACKAGE_VERSION "sprint34")
26+
set(PACKAGE_VERSION "sprint35")
2727
endif()
2828
message(STATUS "Using Package Version: ${PACKAGE_VERSION}")
2929

RELEASE_NOTES.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,49 @@
11
RELEASE NOTES
22

3+
**Version**: sprint35
4+
5+
NEW FEATURES
6+
7+
* Fbx Exporter: Added camera export support
8+
9+
Export game camera as film camera, with filmback settings set to 35 mm TV Projection (0.816 x 0.612).
10+
The camera aperture with always have a height of 0.612 inches, while the width will depend on the aspect of the Unity camera,
11+
as camera width = aspectRatio * height.
12+
The projection type (perspective/orthogonal), aspect ratio, focal length, field of view, near plane, and far plane are also
13+
exported. Background color and clear flags are exported as custom properties.
14+
The last camera exported is set to the default camera in the FBX file.
15+
NOTE: the field of view will show up as a different value in Maya. This is because Unity display's the vertical FOV,
16+
Maya displays the horizontal FOV.
17+
NOTE: for GameObjects that have both a mesh and a camera component, only the mesh will be exported.
18+
19+
* Export Settings: Grouped settings visually into 2 categories
20+
21+
Categories are: Export Options and Integration
22+
23+
* Maya Unity Integration: Added export setting option to hide native "File->Send To Unity" menu
24+
25+
* Unity 3D application Integration: Different installation popup message if "Keep open" checked
26+
27+
To avoid misleading successful installation message popping up before installation completes, instead of
28+
"Enjoy the new Unity menu in {3DApp}", show "Installing Unity menu in {3DApp}, application will open once installation is complete",
29+
if user selected to launch the 3D application after installation.
30+
31+
* Maya Unity Integration: Added Unity plugin version to File->Unity menu item's tooltip
32+
33+
* Fbx Exporter: Export GameObject visibility
34+
35+
Set FbxNode visibility based on whether a GameObject is enabled.
36+
NOTE: a disabled FBX node will be imported into Unity as an enabled GameObject with a disabled Mesh Renderer.
37+
NOTE: in 3ds Max disabled objects will still be visible
38+
39+
FIXES
40+
* Export Settings: Changed "Launch 3D Application" to "Keep open"
41+
* Fbx Exporter: cleaned up code: removed TODO's, unused, and commented out code
42+
* Export Settings: Fix settings giving error when updating to sprint34 package
43+
* Fbx Exporter: fix error when exporting meshes with missing normals, tangents, binormals, or vertex colors
44+
* Export Settings: Fix empty dropdown selection when uninstalling 3D applications
45+
* Convert to Linked Prefab: fix prefab instance name differing from prefab file name when filename is incremented
46+
347
**Version**: sprint34
448

549
NEW FEATURES

0 commit comments

Comments
 (0)