Commit 5e290949 authored by Gabriel Le Breton's avatar Gabriel Le Breton

Update project to 2019.2.11f1

parent 99408ec2
......@@ -6,7 +6,7 @@ namespace UnityEditor
{
[CustomGridBrush(true, false, false, "Coordinate Brush")]
[CreateAssetMenu(fileName = "New Coordinate Brush", menuName = "Brushes/Coordinate Brush")]
public class CoordinateBrush : GridBrush {
public class CoordinateBrush : UnityEditor.Tilemaps.GridBrush {
public int z = 0;
public override void Paint(GridLayout grid, GameObject brushTarget, Vector3Int position)
......@@ -36,7 +36,7 @@ namespace UnityEditor
}
[CustomEditor(typeof(CoordinateBrush))]
public class CoordinateBrushEditor : GridBrushEditor
public class CoordinateBrushEditor : UnityEditor.Tilemaps.GridBrushEditor
{
private CoordinateBrush coordinateBrush { get { return target as CoordinateBrush; } }
......
......@@ -466,7 +466,7 @@ namespace UnityEditor
}
[CustomEditor(typeof(GameObjectBrush))]
public class GameObjectBrushEditor : GridBrushEditorBase
public class GameObjectBrushEditor : UnityEditor.Tilemaps.GridBrushEditorBase
{
public GameObjectBrush brush { get { return target as GameObjectBrush; } }
......
......@@ -6,7 +6,7 @@ using UnityEngine.Tilemaps;
namespace UnityEditor
{
[CustomGridBrush(true, false, false, "Group Brush")]
public class GroupBrush : GridBrush
public class GroupBrush : UnityEditor.Tilemaps.GridBrush
{
public Vector3Int gap
{
......@@ -177,7 +177,7 @@ namespace UnityEditor
}
[CustomEditor(typeof(GroupBrush))]
public class GroupBrushEditor : GridBrushEditor
public class GroupBrushEditor : UnityEditor.Tilemaps.GridBrushEditor
{
}
}
......@@ -9,7 +9,7 @@ namespace UnityEditor
{
[CustomGridBrush(true, false, false, "Line Brush")]
[CreateAssetMenu(fileName = "New Line Brush", menuName = "Brushes/Line Brush")]
public class LineBrush : GridBrush
public class LineBrush : UnityEditor.Tilemaps.GridBrush
{
public bool lineStartActive = false;
public bool fillGaps = false;
......@@ -150,7 +150,7 @@ namespace UnityEditor
}
[CustomEditor(typeof(LineBrush))]
public class LineBrushEditor : GridBrushEditor
public class LineBrushEditor : UnityEditor.Tilemaps.GridBrushEditor
{
private LineBrush lineBrush { get { return target as LineBrush; } }
private Tilemap lastTilemap;
......
......@@ -7,7 +7,7 @@ namespace UnityEditor
{
[CreateAssetMenu(fileName = "Prefab brush", menuName = "Brushes/Prefab brush")]
[CustomGridBrush(false, true, false, "Prefab Brush")]
public class PrefabBrush : GridBrush
public class PrefabBrush : UnityEditor.Tilemaps.GridBrush
{
private const float k_PerlinOffset = 100000f;
public GameObject[] m_Prefabs;
......@@ -83,7 +83,7 @@ namespace UnityEditor
}
[CustomEditor(typeof(PrefabBrush))]
public class PrefabBrushEditor : GridBrushEditor
public class PrefabBrushEditor : UnityEditor.Tilemaps.GridBrushEditor
{
private PrefabBrush prefabBrush { get { return target as PrefabBrush; } }
......
......@@ -8,7 +8,7 @@ namespace UnityEditor
{
[CustomGridBrush(false, false, false, "Random Brush")]
[CreateAssetMenu(fileName = "New Random Brush", menuName = "Brushes/Random Brush")]
public class RandomBrush : GridBrush
public class RandomBrush : UnityEditor.Tilemaps.GridBrush
{
internal struct SizeEnumerator : IEnumerator<Vector3Int>
{
......@@ -133,7 +133,7 @@ namespace UnityEditor
}
[CustomEditor(typeof(RandomBrush))]
public class RandomBrushEditor : GridBrushEditor
public class RandomBrushEditor : UnityEditor.Tilemaps.GridBrushEditor
{
private RandomBrush randomBrush { get { return target as RandomBrush; } }
private GameObject lastBrushTarget;
......
......@@ -84,7 +84,7 @@ namespace UnityEditor
}
[CustomEditor(typeof(TintBrushSmooth))]
public class TintBrushSmoothEditor : GridBrushEditorBase
public class TintBrushSmoothEditor : UnityEditor.Tilemaps.GridBrushEditorBase
{
public TintBrushSmooth brush { get { return target as TintBrushSmooth; } }
......
......@@ -61,7 +61,7 @@ namespace UnityEditor
[CustomEditor(typeof(TintBrush))]
public class TintBrushEditor : GridBrushEditorBase
public class TintBrushEditor : UnityEditor.Tilemaps.GridBrushEditorBase
{
public override GameObject[] validTargets
{
......
fileFormatVersion: 2
guid: 8a0c9218a650547d98138cd835033977
folderAsset: yes
timeCreated: 1484670163
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
{
"dependencies": {
"com.unity.2d.pixel-perfect": "1.0.1-preview",
"com.unity.2d.sprite": "1.0.0",
"com.unity.2d.tilemap": "1.0.0",
"com.unity.ads": "2.3.1",
"com.unity.analytics": "3.3.2",
"com.unity.collab-proxy": "1.2.16",
"com.unity.ext.nunit": "1.0.0",
"com.unity.ide.rider": "1.1.0",
"com.unity.ide.vscode": "1.1.2",
"com.unity.multiplayer-hlapi": "1.0.2",
"com.unity.package-manager-ui": "2.1.2",
"com.unity.package-manager-ui": "2.2.0",
"com.unity.purchasing": "2.0.6",
"com.unity.test-framework": "1.0.13",
"com.unity.textmeshpro": "2.0.1",
"com.unity.timeline": "1.0.0",
"com.unity.timeline": "1.1.0",
"com.unity.ugui": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.0.2",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
"com.unity.modules.audio": "1.0.0",
......
m_EditorVersion: 2019.1.14f1
m_EditorVersionWithRevision: 2019.1.14f1 (148b5891095a)
m_EditorVersion: 2019.2.11f1
m_EditorVersionWithRevision: 2019.2.11f1 (5f859a4cfee5)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment