Skip to content

Commit

Permalink
Fix Unity crash when performing undo operation on the prefab brush. (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
MaciekOaky committed Apr 5, 2023
1 parent efc0a1e commit c351b8b
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions Editor/Brushes/PrefabBrushes/BasePrefabBrush.cs
Expand Up @@ -2,7 +2,7 @@
using UnityEngine;

namespace UnityEditor.Tilemaps
{
{
/// <summary>
/// This base class for PrefabBrushes that contains common functionality
/// </summary>
Expand Down Expand Up @@ -53,17 +53,18 @@ protected void InstantiatePrefabInCell(GridLayout grid, GameObject brushTarget,
{
Undo.MoveGameObjectToScene(instance, brushTarget.scene, "Paint Prefabs");
Undo.RegisterCreatedObjectUndo((Object)instance, "Paint Prefabs");
instance.transform.SetParent(brushTarget.transform);

Undo.SetTransformParent(instance.transform, brushTarget.transform, "Paint Prefabs: Modify parent");
instance.transform.position = grid.LocalToWorld(grid.CellToLocalInterpolated(position + m_Anchor));
instance.transform.rotation = rotation;
}
}
}

/// <summary>
/// The Base Brush Editor for a Prefab Brush.
/// </summary>
public class BasePrefabBrushEditor : GridBrushEditor
public class BasePrefabBrushEditor : GridBrushEditor
{
private SerializedProperty m_Anchor;

Expand Down Expand Up @@ -93,4 +94,4 @@ public override void OnPaintInspectorGUI()
m_SerializedObject.ApplyModifiedPropertiesWithoutUndo();
}
}
}
}

0 comments on commit c351b8b

Please sign in to comment.