Merge pull request #10 from VRLabs/fix/fix-crashing

Fix crashing when instancing a package with a prefab which references an FBX

Instancer.cs

@@ -255,6 +255,7 @@ static void FixReferences(string[] localAssetPaths, string sourceFolder, string
 					bool newChanged = false;
 					do
 					{
+						if (property.propertyPath.Contains("m_Modification")) continue;
 						if (property.propertyType == SerializedPropertyType.ObjectReference)
 						{
 							if (property.objectReferenceValue != null)
@@ -297,24 +298,14 @@ static void RenameInstance(string[] localAssetPaths, string targetFolder, string
 				UnityEngine.Object[] targetAssets = AssetDatabase.LoadAllAssetsAtPath(targetAssetPath).Where(x => x != null).ToArray();
 				if (targetAssets.Length == 0) continue;
 				string[] possibleNames = new []{packageName, packageName.Replace("-", ""), packageName.Replace("-", " ")};
-
-				String fileName = Path.GetFileName(targetAssetPath);
-				foreach (string possibleName in possibleNames)
-				{
-					if (fileName.StartsWith(possibleName))
-					{
-						fileName = ReplaceAtStart(fileName, possibleName, newInstanceName);
-						AssetDatabase.RenameAsset(targetAssetPath, fileName);
-						break;
-					}
-				}
 
 				foreach (var targetAsset in targetAssets)
 				{
 					SerializedObject serializedObject = new SerializedObject(targetAsset);
 					SerializedProperty property = serializedObject.GetIterator();
 					do
 					{
+						if (property.propertyPath.Contains("m_Modification")) continue;
 						if (property.propertyType == SerializedPropertyType.String)
 						{
 							string value = property.stringValue;
@@ -333,6 +324,17 @@ static void RenameInstance(string[] localAssetPaths, string targetFolder, string
 
 					serializedObject.ApplyModifiedProperties();	
 				}
+
+				String fileName = Path.GetFileName(targetAssetPath);
+				foreach (string possibleName in possibleNames)
+				{
+					if (fileName.StartsWith(possibleName))
+					{
+						fileName = ReplaceAtStart(fileName, possibleName, newInstanceName);
+						AssetDatabase.RenameAsset(targetAssetPath, fileName);
+						break;
+					}
+				}
 			}
 		}