Skip to content

Commit

Permalink
Merge pull request #10 from Joshuarox100/development
Browse files Browse the repository at this point in the history
v1.1.2 Merge
  • Loading branch information
Joshuarox100 authored Jan 29, 2021
2 parents 1258c99 + d609e5e commit c1f6322
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions Editor/Assets/InventoryPresetEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ public void OnEnable()
enableGroupContents.onAddCallback += (ReorderableList list) =>
{
// Accessor string
string listKey = AssetDatabase.GetAssetPath(preset.Pages[focusedItemPage]) + "/" + preset.Pages[focusedItemPage].name;
string listKey = preset.Pages[focusedItemPage].GetInstanceID().ToString();

// If no elements are present.
if (list.count == 0)
Expand Down Expand Up @@ -522,7 +522,7 @@ public void OnEnable()
if (list.list.Count > 0)
{
// Accessor string
string listKey = AssetDatabase.GetAssetPath(preset.Pages[focusedItemPage]) + "/" + preset.Pages[focusedItemPage].name;
string listKey = preset.Pages[focusedItemPage].GetInstanceID().ToString();

// Mark the preset as dirty, record the current page item, and set the item to null.
EditorUtility.SetDirty(preset);
Expand Down Expand Up @@ -636,7 +636,7 @@ public void OnEnable()
disableGroupContents.onAddCallback += (ReorderableList list) =>
{
// Accessor string
string listKey = AssetDatabase.GetAssetPath(preset.Pages[focusedItemPage]) + "/" + preset.Pages[focusedItemPage].name;
string listKey = preset.Pages[focusedItemPage].GetInstanceID().ToString();

// If no elements are present.
if (list.count == 0)
Expand Down Expand Up @@ -713,7 +713,7 @@ public void OnEnable()
if (list.list.Count > 0)
{
// Accessor string
string listKey = AssetDatabase.GetAssetPath(preset.Pages[focusedItemPage]) + "/" + preset.Pages[focusedItemPage].name;
string listKey = preset.Pages[focusedItemPage].GetInstanceID().ToString();

// Mark the preset as dirty, record the current page item, and set the item to null.
EditorUtility.SetDirty(preset);
Expand Down Expand Up @@ -827,7 +827,7 @@ public void OnEnable()
buttonGroupContents.onAddCallback += (ReorderableList list) =>
{
// Accessor string
string listKey = AssetDatabase.GetAssetPath(preset.Pages[focusedItemPage]) + "/" + preset.Pages[focusedItemPage].name;
string listKey = preset.Pages[focusedItemPage].GetInstanceID().ToString();

// If no elements are present.
if (list.count == 0)
Expand Down Expand Up @@ -904,7 +904,7 @@ public void OnEnable()
if (list.list.Count > 0)
{
// Accessor string
string listKey = AssetDatabase.GetAssetPath(preset.Pages[focusedItemPage]) + "/" + preset.Pages[focusedItemPage].name;
string listKey = preset.Pages[focusedItemPage].GetInstanceID().ToString();

// Mark the preset as dirty, record the current page item, and set the item to null.
EditorUtility.SetDirty(preset);
Expand Down
2 changes: 1 addition & 1 deletion Editor/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.1.1
v1.1.2

0 comments on commit c1f6322

Please sign in to comment.