Merge pull request #159 from Unity-Technologies/Uni-25868-release

Uni-25868-release

Author: vkovec

Assets/FbxExporters/README.txt

@@ -5,7 +5,7 @@ Copyright (c) 2017 Unity Technologies. All rights reserved.
 
 See LICENSE.txt file for full license information.
 
-VERSION: build20170921001
+VERSION: sprint26
 
 Requirements
 ------------

Assets/Integrations/Autodesk/maya/scripts/unityOneClick/version.py

@@ -19,7 +19,7 @@
 @defgroup UnityOneClickPluginVersion Plugin Version
 @ingroup UnityOneClickPlugin
 """
-VERSION = 'build20170921001'
+VERSION = 'sprint26'
 
 def pluginPrefix():
     """

CMakeLists.txt

@@ -115,8 +115,13 @@ file(GLOB PYC_FILES "${CMAKE_SOURCE_DIR}/Assets/Integrations/Autodesk/maya/scrip
 IF( PYC_FILES )
     file(REMOVE ${PYC_FILES})
 ENDIF()
+# remove .meta files from Integrations
+file(GLOB_RECURSE META_FILES "${CMAKE_SOURCE_DIR}/Assets/Integrations/*.meta")
 
 add_custom_command(OUTPUT ${MAYA_INTEGRATION_ZIP_NAME}
+    IF(META_FILES)
+        COMMAND ${CMAKE_COMMAND} -E remove ${META_FILES}
+    ENDIF
     COMMAND ${CMAKE_COMMAND} -E tar "cfv" ${CMAKE_SOURCE_DIR}/Assets/FbxExporters/${MAYA_INTEGRATION_ZIP_NAME} --format=zip
        "${CMAKE_SOURCE_DIR}/Assets/Integrations"
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/Assets

RELEASE_NOTES.md

@@ -1,5 +1,15 @@
 RELEASE NOTES
 
+**Version**: sprint26
+
+NEW FEATURES
+
+* Fbx Export: add support for installing a zipped version of the Maya Unity Integration
+
+FIXES
+
+* Fbx Prefab: Properly handle updating Linked Prefab Instances that get nested inside other Prefabs.
+
 **Version**: 0.0.14a
 
 NEW FEATURES
@@ -296,4 +306,4 @@ FIXES
 * Convert to Model : ensure only called once from context menu with multiple selection.
 * Convert to Model: ensure instanced prefab linked to prefab on disk
 * Convert to Model: don’t overwrite existing files for example, if “Sphere.fbx” exists then the file will be called “Sphere1.fbx”
-* Convert to Model: ensure order of copied siblings in matches original; ensure all GameObjects have unique names before export
+* Convert to Model: ensure order of copied siblings in matches original; ensure all GameObjects have unique names before export