Merge remote-tracking branch 'origin/master' into feature/agx-lidar

Author: FilipAlg

Diff for: AGXUnity/WireRoute.cs

@@ -18,7 +18,7 @@ namespace AGXUnity
   /// Wire.RouteNode myNode = route.FirstOrDefault( node => node.Frame == thisFrame );
   /// </example>
   [Serializable]
-  public class WireRoute : Route<WireRouteNode>
+  public class WireRoute : Route<WireRouteNode>, ISerializationCallbackReceiver
   {
     /// <summary>
     /// Checks validity of current route.
@@ -177,5 +177,16 @@ private void OnRemovedFromList( WireRouteNode node, int index )
     {
       node.Wire = null;
     }
+
+    public void OnBeforeSerialize() { }
+
+    public void OnAfterDeserialize()
+    {
+      // Remove callback if it exists to avoid any possible duplicates
+      OnNodeAdded   -= this.OnAddedToList;
+      OnNodeRemoved -= this.OnRemovedFromList;
+      OnNodeAdded   += this.OnAddedToList;
+      OnNodeRemoved += this.OnRemovedFromList;
+    }
   }
 }

Diff for: Editor/AGXUnityEditor/PatchHelper.cs

@@ -91,7 +91,7 @@ public static void ApplyPatches()
           HandlePrefabPath( prefabs[ i ] );
         }
 
-        var scenes = AssetDatabase.FindAssets( "t:scene" ).Select(guid => AssetDatabase.GUIDToAssetPath( guid ) ).ToArray();
+        var scenes = AssetDatabase.FindAssets( "t:scene" ).Select(guid => AssetDatabase.GUIDToAssetPath( guid ) ).Where(p => !p.StartsWith("Packages")).ToArray();
         var setup = EditorSceneManager.GetSceneManagerSetup();
         for ( int i = 0; i < scenes.Length; i++ ) {
           EditorUtility.DisplayProgressBar( "Patching objects to 5.2.0", "Patching Scenes...", (float)i / scenes.Length );
@@ -228,7 +228,7 @@ private static void MigrateMassProperties( AGXUnity.Deprecated.MassProperties ol
     {
       if ( oldMP != null ) {
         var rb = oldMP.RigidBody;
-        if ( !ShouldPatch ) return;
+        if ( rb == null || !ShouldPatch ) return;
         CopyDefaultAndUserValue( oldMP.Mass, rb.MassProperties.Mass );
         CopyDefaultAndUserValue( oldMP.InertiaDiagonal, rb.MassProperties.InertiaDiagonal );
         CopyDefaultAndUserValue( oldMP.InertiaOffDiagonal, rb.MassProperties.InertiaOffDiagonal );