Merge remote-tracking branch 'refs/remotes/origin/master' into merge-austin-unite-branch

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -207,16 +207,13 @@ public static GameObject Convert (
 
                 // Create a prefab from the instantiated and componentized unityGO.
                 var prefabFileName = Path.ChangeExtension(projectRelativePath, ".prefab");
-                var prefab = PrefabUtility.CreatePrefab(prefabFileName, unityGO);
+                var prefab = PrefabUtility.CreatePrefab(prefabFileName, unityGO, ReplacePrefabOptions.ConnectToPrefab);
                 if (!prefab) {
                     throw new System.Exception(
                         string.Format("Failed to create prefab asset in [{0}] from fbx [{1}]",
                             prefabFileName, fbxFullPath));
                 }
 
-                // Connect to the prefab file.
-                unityGO = PrefabUtility.ConnectGameObjectToPrefab(unityGO, prefab);
-
                 // Remove (now redundant) gameobject
                 bool actuallyKeepOriginal;
                 switch(keepOriginal) {

Assets/Integrations/Autodesk/maya/scripts/UnityFbxForMaya/commands.py

@@ -160,6 +160,8 @@ def beforeImport(self, retCode, file, clientData):
         if not self.setExists(self._exportSet):
             # couldn't find export set so create it
             maya.cmds.sets(name=self._exportSet)
+            # unlock set so we can add attributes to it
+            maya.cmds.lockNode(self._exportSet, lock=False)
 
         # reset attribute values, in case import fails
         self.storeAttribute(self._exportSet, self._unityFbxFilePathAttr, "")
@@ -197,6 +199,9 @@ def afterImport(self, *args, **kwargs):
             # add newly imported items to set
             if len(newItems) > 0:
                 maya.cmds.sets(newItems, include=self._exportSet)
+                
+            # lock set so it doesn't get deleted when empty
+            maya.cmds.lockNode(self._exportSet, lock=True)    
 
     def doIt(self, args):
         self.loadDependencies()