Merge branch 'master' into UNI-41724-sprint50-release

Author: vkovec

Assets/FbxExporters/Editor/ConvertToModel.cs

@@ -108,18 +108,7 @@ public static GameObject Convert (
             )
             {
                 // Only create the prefab (no FBX export) if we have selected the root of a model prefab instance.
-                // Children of model prefab instances will also have "model prefab instance"
-                // as their prefab type, so it is important that it is the root that is selected.
-                //
-                // e.g. If I have the following hierarchy: 
-                //      Cube
-                //      -- Sphere
-                //
-                // Both the Cube and Sphere will have ModelPrefabInstance as their prefab type.
-                // However, when selecting the Sphere to convert, we don't want to connect it to the
-                // existing FBX but create a new FBX containing just the sphere.
-                PrefabType unityPrefabType = PrefabUtility.GetPrefabType(toConvert);
-                if (unityPrefabType == PrefabType.ModelPrefabInstance && toConvert.Equals(PrefabUtility.FindPrefabRoot(toConvert))) {
+                if(IsModelInstance(toConvert)){
                     // don't re-export fbx
                     // create prefab out of model instance in scene, link to existing fbx
                     var mainAsset = PrefabUtility.GetPrefabParent(toConvert) as GameObject;
@@ -223,6 +212,26 @@ public static void SetupFbxPrefab(GameObject toConvert, GameObject unityMainAsse
                 }
             }
 
+            /// <summary>
+            /// Determines if the given GameObject is a model instance.
+            /// </summary>
+            /// <returns><c>true</c> if go is a model instance; otherwise, <c>false</c>.</returns>
+            /// <param name="go">Go.</param>
+            public static bool IsModelInstance(GameObject go){
+                // Children of model prefab instances will also have "model prefab instance"
+                // as their prefab type, so it is important that it is the root that is selected.
+                //
+                // e.g. If I have the following hierarchy: 
+                //      Cube
+                //      -- Sphere
+                //
+                // Both the Cube and Sphere will have ModelPrefabInstance as their prefab type.
+                // However, when selecting the Sphere to convert, we don't want to connect it to the
+                // existing FBX but create a new FBX containing just the sphere.
+                PrefabType unityPrefabType = PrefabUtility.GetPrefabType(go);
+                return unityPrefabType == PrefabType.ModelPrefabInstance && go.Equals (PrefabUtility.FindPrefabRoot (go));
+            }
+
             /// <summary>
             /// Check if the file exists, and if it does, then increment the name.
             /// e.g. if filename is Sphere.fbx and it already exists, change it to Sphere 1.fbx.

Assets/FbxExporters/Editor/ConvertToPrefabEditorWindow.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
@@ -45,12 +45,23 @@ protected void SetGameObjectsToConvert(IEnumerable<GameObject> toConvert){
 
                 TransferAnimationSource = null;
                 TransferAnimationDest = null;
-
                 if (ToExport.Length == 1) {
-                    m_prefabFileName = ToExport [0].name;
+                    var go = ModelExporter.GetGameObject (ToExport [0]);
+                    // check if the GameObject is a model instance, use as default filename and path if it is
+                    if(ConvertToModel.IsModelInstance(go)) {
+                        var mainAsset = PrefabUtility.GetPrefabParent (go) as GameObject;
+                        var mainAssetRelPath = AssetDatabase.GetAssetPath (mainAsset);
+                        // remove Assets/ from beginning of path
+                        mainAssetRelPath = mainAssetRelPath.Substring ("Assets".Length);
+
+                        m_prefabFileName = System.IO.Path.GetFileNameWithoutExtension (mainAssetRelPath);
+                        ExportSettings.AddFbxSavePath (System.IO.Path.GetDirectoryName (mainAssetRelPath));
+                    }
+                    else{
+                        m_prefabFileName = ToExport [0].name;
+                    }
 
                     // if only one object selected, set transfer source/dest to this object
-                    var go = ModelExporter.GetGameObject (ToExport [0]);
                     if (go) {
                         TransferAnimationSource = go.transform;
                         TransferAnimationDest = go.transform;
@@ -71,8 +82,18 @@ protected override void OnEnable ()
                 m_prefabExtLabelWidth = m_fbxExtLabelStyle.CalcSize (new GUIContent (".prefab")).x;
             }
 
-            protected override void Export ()
+            protected override bool Export ()
             {
+                if (string.IsNullOrEmpty (m_exportFileName)) {
+                    Debug.LogError ("FbxExporter: Please specify an fbx filename");
+                    return false;
+                }
+
+                if (string.IsNullOrEmpty (m_prefabFileName)) {
+                    Debug.LogError ("FbxExporter: Please specify a prefab filename");
+                    return false;
+                }
+
                 var fbxDirPath = ExportSettings.GetFbxAbsoluteSavePath ();
                 var fbxPath = System.IO.Path.Combine (fbxDirPath, m_exportFileName + ".fbx");
 
@@ -81,20 +102,45 @@ protected override void Export ()
 
                 // check if file already exists, give a warning if it does
                 if (!OverwriteExistingFile (fbxPath) || !OverwriteExistingFile (prefabPath)) {
-                    return;
+                    return false;
                 }
 
                 if (ToExport == null) {
                     Debug.LogError ("FbxExporter: missing object for conversion");
-                    return;
+                    return false;
                 }
 
                 if (ToExport.Length == 1) {
                     var go = ModelExporter.GetGameObject (ToExport [0]);
+
+                    if (!OverwriteExistingFile (prefabPath)) {
+                        return false;
+                    }
+
+                    // Only create the prefab (no FBX export) if we have selected the root of a model prefab instance.
+                    if(ConvertToModel.IsModelInstance(go)) {
+                        // don't re-export fbx
+                        // create prefab out of model instance in scene, link to existing fbx
+                        var mainAsset = PrefabUtility.GetPrefabParent(go) as GameObject;
+                        var mainAssetRelPath = AssetDatabase.GetAssetPath(mainAsset);
+                        var mainAssetAbsPath = System.IO.Directory.GetParent(Application.dataPath) + "/" + mainAssetRelPath;
+                        var relPrefabPath = ExportSettings.GetProjectRelativePath (prefabPath);
+
+                        if (string.Equals(System.IO.Path.GetFullPath(fbxPath), System.IO.Path.GetFullPath(mainAssetAbsPath))) {
+                            ConvertToModel.SetupFbxPrefab(go, mainAsset, relPrefabPath, mainAssetAbsPath);
+                            return true;
+                        }
+                    }
+
+                    // check if file already exists, give a warning if it does
+                    if (!OverwriteExistingFile (fbxPath)) {
+                        return false;
+                    }
+
                     ConvertToModel.Convert (
                         go, fbxFullPath: fbxPath, prefabFullPath: prefabPath, exportOptions: ExportSettings.instance.convertToPrefabSettings.info
                     );
-                    return;
+                    return true;
                 }
 
                 foreach (var obj in ToExport) {
@@ -103,6 +149,7 @@ protected override void Export ()
                         go, fbxDirectoryFullPath: fbxDirPath, prefabDirectoryFullPath: prefabDirPath, exportOptions: ExportSettings.instance.convertToPrefabSettings.info
                     );
                 }
+                return true;
             }
 
             protected override ExportOptionsSettingsSerializeBase SettingsObject

Assets/FbxExporters/Editor/ExportModelEditorWindow.cs

@@ -1,4 +1,4 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
@@ -116,7 +116,7 @@ public void OnPresetSelectionChanged()
                 this.Repaint ();
             }
 
-            protected abstract void Export ();
+            protected abstract bool Export ();
 
             /// <summary>
             /// Function to be used by derived classes to add custom UI between the file path selector and export options.
@@ -356,8 +356,9 @@ protected void OnGUI ()
                 }
 
                 if (GUILayout.Button (ExportButtonName, GUILayout.Width(ExportButtonWidth))) {
-                    Export ();
-                    this.Close ();
+                    if (Export ()) {
+                        this.Close ();
+                    }
                 }
                 GUILayout.EndHorizontal ();
 
@@ -412,6 +413,7 @@ protected bool IsTimelineAnim {
                 set{
                     m_isTimelineAnim = value;
                     if (m_isTimelineAnim) {
+                        m_previousInclude = ExportSettings.instance.exportModelSettings.info.ModelAnimIncludeOption;
                         ExportSettings.instance.exportModelSettings.info.SetModelAnimIncludeOption(ExportSettings.Include.Anim);
                     }
                     if (m_innerEditor) {
@@ -451,6 +453,8 @@ protected override ExportOptionsSettingsSerializeBase SettingsObject
                 get { return ExportSettings.instance.exportModelSettings.info; }
             }
 
+            private ExportSettings.Include m_previousInclude = ExportSettings.Include.ModelAndAnim;
+
             public static void Init (IEnumerable<UnityEngine.Object> toExport, string filename = "", bool isTimelineAnim = false, bool isPlayableDirector = false)
             {
                 ExportModelEditorWindow window = CreateWindow<ExportModelEditorWindow> ();
@@ -509,12 +513,33 @@ protected override void OnEnable ()
                 }
             }
 
-            protected override void Export(){
+            protected void OnDisable()
+            {
+                RestoreSettings ();
+            }
+
+            /// <summary>
+            /// Restore changed export settings after export
+            /// </summary>
+            protected virtual void RestoreSettings()
+            {
+                if (IsTimelineAnim) {
+                    ExportSettings.instance.exportModelSettings.info.SetModelAnimIncludeOption(m_previousInclude);
+                    SaveExportSettings ();
+                }
+            }
+
+
+            protected override bool Export(){
+                if (string.IsNullOrEmpty (m_exportFileName)) {
+                    Debug.LogError ("FbxExporter: Please specify an fbx filename");
+                    return false;
+                }
                 var folderPath = ExportSettings.GetFbxAbsoluteSavePath ();
                 var filePath = System.IO.Path.Combine (folderPath, m_exportFileName + ".fbx");
 
                 if (!OverwriteExistingFile (filePath)) {
-                    return;
+                    return false;
                 }
 
                 if (IsPlayableDirector) {
@@ -528,14 +553,15 @@ protected override void Export(){
                     // refresh the asset database so that the file appears in the
                     // asset folder view.
                     AssetDatabase.Refresh ();
-                    return;
+                    return true;
                 }
 
                 if (ModelExporter.ExportObjects (filePath, ToExport, SettingsObject, timelineAnim: m_isTimelineAnim) != null) {
                     // refresh the asset database so that the file appears in the
                     // asset folder view.
                     AssetDatabase.Refresh ();
                 }
+                return true;
             }
 
             #if UNITY_2018_1_OR_NEWER  

Assets/FbxExporters/Editor/FbxExporter.cs

@@ -3780,7 +3780,7 @@ bool ExportMesh (GameObject gameObject, FbxNode fbxNode)
 
                 // if user doesn't want to export mesh colliders, and this gameobject doesn't have a renderer
                 // then don't export it.
-                if (!ExportOptions.ExportUnrendered && !gameObject.GetComponent<Renderer>()) {
+                if (!ExportOptions.ExportUnrendered && (!gameObject.GetComponent<Renderer>() || !gameObject.GetComponent<Renderer>().enabled)) {
                     return false;
                 }
 

Assets/FbxExporters/LICENSE.txt

@@ -1,35 +1,5 @@
-Unity Companion License 1.0 (“License”)
-Copyright © 2017 Unity Technologies ApS (“Unity”)
- 
-Unity hereby grants to you a worldwide, non-exclusive, no-charge, and royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute the software that is made available with this License (“Software”), subject to the following terms and conditions: 
- 
-1. Unity Companion Use Only. Exercise of the license granted herein is limited to exercise for the creation, use, and/or distribution of applications, software, or other content pursuant to a valid Unity development engine software license (“Engine License”). That means while use of the Software is not limited to use in the software licensed under the Engine License, the Software may not be used for any purpose other than the creation, use, and/or distribution of Engine License-dependent applications, software, or other content. No other exercise of the license granted herein is permitted.
- 
-2. No Modification of Engine License. Neither this License nor any exercise of the license granted herein modifies the Engine License in any way.
- 
-3. Ownership & Grant Back to You. 
+FBX Exporter copyright © 2017 Unity Technologies ApS
 
+Licensed under the Unity Companion License for Unity-dependent projects--see [Unity Companion License](http://www.unity3d.com/legal/licenses/Unity_Companion_License).
 
-3.1 You own your content. In this License, “derivative works” means derivatives of the Software itself--works derived only from the Software by you under this License (for example, modifying the code of the Software itself to improve its efficacy); “derivative works” of the Software do not include, for example, games, apps, or content that you create using the Software. You keep all right, title, and interest to your own content.
-
-
-3.2 Unity owns its content. While you keep all right, title, and interest to your own content per the above, as between Unity and you, Unity will own all right, title, and interest to all intellectual property rights (including patent, trademark, and copyright) in the Software and derivative works of the Software, and you hereby assign and agree to assign all such rights in those derivative works to Unity. 
-
-
-3.3 You have a license to those derivative works. Subject to this License, Unity grants to you the same worldwide, non-exclusive, no-charge, and royalty-free copyright license to derivative works of the Software you create as is granted to you for the Software under this License.
- 
-4. Trademarks. You are not granted any right or license under this License to use any trademarks, service marks, trade names, products names, or branding of Unity or its affiliates (“Trademarks”). Descriptive uses of Trademarks are permitted; see, for example, Unity’s Branding Usage Guidelines at https://unity3d.com/public-relations/brand.
- 
-5. Notices & Third-Party Rights. This License, including the copyright notice above, must be provided in all substantial portions of the Software and derivative works thereof (or, if that is impracticable, in any other location where such notices are customarily placed). Further, if the Software is accompanied by a Unity “third-party notices” or similar file, you acknowledge and agree that software identified in that file is governed by those separate license terms.
- 
-6. DISCLAIMER, LIMITATION OF LIABILITY. THE SOFTWARE AND ANY DERIVATIVE WORKS THEREOF IS PROVIDED ON AN "AS IS" BASIS, AND IS PROVIDED WITHOUT WARRANTY OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND/OR NONINFRINGEMENT. IN NO EVENT SHALL ANY COPYRIGHT HOLDER OR AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES (WHETHER DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL, INCLUDING PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, LOSS OF USE, DATA, OR PROFITS, AND BUSINESS INTERRUPTION), OR OTHER LIABILITY WHATSOEVER, WHETHER IN AN ACTION OF CONTRACT, TORT, OR OTHERWISE, ARISING FROM OR OUT OF, OR IN CONNECTION WITH, THE SOFTWARE OR ANY DERIVATIVE WORKS THEREOF OR THE USE OF OR OTHER DEALINGS IN SAME, EVEN WHERE ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- 
-7. USE IS ACCEPTANCE and License Versions. Your receipt and use of the Software constitutes your acceptance of this License and its terms and conditions. Software released by Unity under this License may be modified or updated and the License with it; upon any such modification or update, you will comply with the terms of the updated License for any use of any of the Software under the updated License. 
- 
-8. Use in Compliance with Law and Termination. Your exercise of the license granted herein will at all times be in compliance with applicable law and will not infringe any proprietary rights (including intellectual property rights); this License will terminate immediately on any breach by you of this License.
-
-
-9. Severability. If any provision of this License is held to be unenforceable or invalid, that provision will be enforced to the maximum extent possible and the other provisions will remain in full force and effect.
-
-
-10. Governing Law and Venue. This License is governed by and construed in accordance with the laws of Denmark, except for its conflict of laws rules; the United Nations Convention on Contracts for the International Sale of Goods will not apply. If you reside (or your principal place of business is) within the United States, you and Unity agree to submit to the personal and exclusive jurisdiction of and venue in the state and federal courts located in San Francisco County, California concerning any dispute arising out of this License (“Dispute”). If you reside (or your principal place of business is) outside the United States, you and Unity agree to submit to the personal and exclusive jurisdiction of and venue in the courts located in Copenhagen, Denmark concerning any Dispute.
+Unless expressly provided otherwise, the Software under this license is made available strictly on an "AS IS" BASIS WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED. Please review the license for details on these and other terms and conditions.

RELEASE_NOTES_EXTERNAL.md

@@ -16,6 +16,22 @@ Error caused by UnityFbxSdk.dll being set as compatible with any platform instea
 
 **Version**: 1.2.0b1
 
+NEW FEATURES
+* Added Maya LT one button import/export
+* Added Camera export support 
+
 **Version**: 1.1.0b1
 
-**Version**: 1.0.0b1
+NEW FEATURES
+* Added 3ds Max one button import/export
+
+FIXES
+* Fix so Object references aren't lost when using Convert to Linked Prefab Instance
+* Fix Maya Integration dropdown not appearing in the Export Settings
+
+**Version**: 1.0.0b1
+
+NEW FEATURES
+* Ability to export fbx files from Unity
+* Convert to linked prefab to create a prefab that auto-updates with the linked fbx
+* Maya one button import/export