Merge pull request #355 from Unity-Technologies/merge-master-dev

Merge master dev

Author: clusty

com.unity.formats.alembic/Editor/Exporter/AlembicExporterEditor.cs

@@ -129,6 +129,7 @@ internal static bool DrawSettings(SerializedObject so,
                 EditorGUI.indentLevel--;
             }
 
+
             foldMeshComponents.value = EditorGUILayout.Foldout(foldMeshComponents, "Mesh Components");
             if (foldMeshComponents)
             {

com.unity.formats.alembic/Editor/Unity.Formats.Alembic.Editor.api

@@ -1,3 +1,14 @@
 // This file is generated. Do not modify by hand.
 // XML documentation file not found. To check if public methods have XML comments,
 // make sure the XML doc file is present and located next to the scraped dll
+namespace UnityEditor.Formats.Alembic.Recorder
+{
+    [UnityEditor.Recorder.RecorderSettings(typeof(UnityEditor.Formats.Alembic.Recorder.AlembicRecorder), @"Alembic Clip", @"alembic_recorder")] public class AlembicRecorderSettings : UnityEditor.Recorder.RecorderSettings
+    {
+        protected virtual string Extension { get; }
+        public virtual System.Collections.Generic.IEnumerable<UnityEditor.Recorder.RecorderInputSettings> InputsSettings { get; }
+        public UnityEngine.Formats.Alembic.Util.AlembicRecorderSettings Settings { get; }
+        public AlembicRecorderSettings() {}
+        public virtual void OnAfterDuplicate();
+    }
+}