Merge remote-tracking branch 'refs/remotes/origin/master' into UNI-32754-skinned-mesh-export

# Conflicts:
#	Assets/FbxExporters/Editor/FbxExporter.cs
#	Assets/FbxExporters/Editor/UnitTests/ModelExporterTest.cs

Author: vkovec

.gitignore

@@ -20,7 +20,8 @@
 **/.idea/
 
 ## Unity ##
-*.meta
+[Aa]ssets/**/*.meta
+![Aa]ssets/FbxExporters/**/*.meta
 [Pp]rojectSettings/*.asset
 [Pp]rojectSettings/*.txt
 

Assets/FbxExporters/Editor.meta

@@ -337,6 +337,11 @@ public static void CopyComponents(GameObject to, GameObject from){
                 var originalComponents = new List<Component>(to.GetComponents<Component> ());
                 // copy over meshes, materials, and nothing else
                 foreach (var component in from.GetComponents<Component>()) {
+                    // ignore missing components
+                    if (component == null) {
+                        continue;
+                    }
+
                     var json = EditorJsonUtility.ToJson(component);
                     if (string.IsNullOrEmpty (json)) {
                         // this happens for missing scripts
@@ -348,6 +353,11 @@ public static void CopyComponents(GameObject to, GameObject from){
 
                     // Find the component to copy to.
                     for (int i = 0, n = originalComponents.Count; i < n; i++) {
+                        // ignore missing components
+                        if (originalComponents [i] == null) {
+                            continue;
+                        }
+
                         if (originalComponents[i].GetType() == expectedType) {
                             // We have found the component we are looking for,
                             // remove it so we don't try to copy to it again