Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-25265-sprint25-release

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -18,7 +18,7 @@ namespace Editor
     {
         public static class ConvertToModel
         {
-            const string MenuItemName1 = "GameObject/Convert To Prefab";
+            const string MenuItemName1 = "GameObject/Convert To Linked Prefab Instance";
 
             /// <summary>
             /// OnContextItem is called either:
@@ -389,6 +389,15 @@ private static void CopyComponentsRecursive(GameObject from, GameObject to, bool
             public static void CopyComponents(GameObject from, GameObject to){
                 var originalComponents = new List<Component>(to.GetComponents<Component> ());
                 foreach(var component in from.GetComponents<Component> ()) {
+                    // UNI-24379: we don't support SkinnedMeshRenderer right
+                    // now: we just bake the mesh into its current pose. So
+                    // don't copy the SMR over. There will already be a
+                    // MeshFilter and MeshRenderer due to the static mesh.
+                    // Remove this code when we support skinning.
+                    if (component is SkinnedMeshRenderer) {
+                        continue;
+                    }
+
                     var json = EditorJsonUtility.ToJson(component);
 
                     System.Type expectedType = component.GetType();

Assets/FbxExporters/Editor/UnitTests/ConvertToModelTest.cs

@@ -188,5 +188,30 @@ public void BasicTest()
                 Assert.IsFalse(cube);
             }
         }
+
+        [Test]
+        public void SkinnedMeshTest()
+        {
+            // UNI-24379: in the first release, the plugin only handles static
+            // meshes, not skinned meshes. Rewrite this test when we add that
+            // feature.
+
+            // Create a cube with a bogus skinned-mesh rather than a static
+            // mesh setup.
+            var cube = GameObject.CreatePrimitive(PrimitiveType.Cube);
+            cube.AddComponent<SkinnedMeshRenderer>();
+            var meshFilter = cube.GetComponent<MeshFilter>();
+            var meshRender = cube.GetComponent<MeshRenderer>();
+            Object.DestroyImmediate(meshRender);
+            Object.DestroyImmediate(meshFilter);
+
+            // Convert it. Make sure it gets deleted, to avoid a useless error about internal consistency.
+            var cubeInstance = ConvertToModel.Convert(cube, fbxFullPath: GetRandomFbxFilePath());
+            if (cube) { Object.DestroyImmediate(cube); }
+
+            // Make sure it doesn't have a skinned mesh renderer on it.
+            // In the future we'll want to assert the opposite!
+            Assert.That(cubeInstance.GetComponentsInChildren<SkinnedMeshRenderer>(), Is.Empty);
+        }
     }
 }

Assets/Integrations/Autodesk/maya/icons/export.png

@@ -38,7 +38,8 @@ class BaseCommand(OpenMayaMPx.MPxCommand, LoggerMixin):
     """
     Base class for UnityOneClick Plugin Commands.
     """
-    kDefaultIcon = 'unity_100.png'
+    kIconPath = ""
+    kFamilyIcon = 'unity.png'
     kFamilyLabel = "The UnityOneClick plugin allows you to reliably exchange and review your work between Maya and Unity."
 
     def __init__(self):
@@ -92,11 +93,11 @@ def loadUnityFbxExportSettings(self):
 
     @classmethod
     def iconPath(cls):
-        return ""
+        return cls.kIconPath
 
     @classmethod
     def familyIconPath(cls):
-        return maya.mel.eval('$tempPath = languageResourcePath("{0}");'.format(cls.kDefaultIcon))
+        return maya.mel.eval('$tempPath = languageResourcePath("{0}");'.format(cls.kFamilyIcon))
 
     def storeAttribute(self, node, attr, attrValue, attrType="string"):
         if not maya.mel.eval('attributeExists "{0}" "{1}"'.format(attr, node)):
@@ -117,6 +118,7 @@ class importCmd(BaseCommand):
     
     @ingroup UnityCommands
     """
+    kIconPath = "import.png"
     kLabel = 'Import FBX file from Unity Project and auto-configure for exporting'
     kShortLabel = 'Import'
     kCmdName = "{}Import".format(version.pluginPrefix())
@@ -145,7 +147,7 @@ def syntaxCreator(cls):
     @classmethod
     def scriptCmd(cls):
         return
-    
+
     def beforeImport(self, retCode, file, clientData):
         # store path and filename
         self._tempPath = file.resolvedPath()
@@ -242,6 +244,7 @@ class previewCmd(BaseCommand):
         
     @ingroup UnityCommands
     """
+    kIconPath = "preview.png"
     kLabel = 'Preview Model in Unity window'
     kShortLabel = 'Preview'
     kCmdName = "{}Preview".format(version.pluginPrefix())
@@ -343,6 +346,7 @@ class exportCmd(BaseCommand):
         
     @ingroup UnityCommands
     """
+    kIconPath = "export.png"
     kLabel = 'Export Model to Unity'
     kShortLabel = 'Export'
     kCmdName = "{}Export".format(version.pluginPrefix())