Skip to content

Commit

Permalink
Merge pull request #114 from arimger/develop
Browse files Browse the repository at this point in the history
Develop - 0.12.13
  • Loading branch information
arimger authored Aug 23, 2024
2 parents acfa0ba + b61d834 commit 6e0f089
Show file tree
Hide file tree
Showing 23 changed files with 1,442 additions and 212 deletions.
12 changes: 12 additions & 0 deletions Assets/Editor Toolbox/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## 0.12.13 [22.08.2024]

### Changed:
- Hierarchy: Added Tree List renderer, which improves visual identification of parent and child gameobjects
- Hierarchy: For now 'Script' label will display all available components linked to a GameObject/Prefabs
- Hierarchy: For now 'Layer' label will display full layer name instead of the layer mask value
- Fix SceneView settings change events firing when they shouldn't
- Fix issue when trying to find private fields/properties from parent classes (e.g. while using conditional attributes)

### Added:
- DisableInEditModeAttribute

## 0.12.12 [17.06.2024]

### Changed:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ public static class ValueExtractionHelper
new MethodValueExtractor()
};


public static bool TryGetValue(string source, object declaringObject, out object value)
{
for (var i = 0; i < extractors.Count; i++)
Expand Down Expand Up @@ -73,7 +72,8 @@ public static bool TryGetValue(string source, SerializedProperty causer, out obj
var parentObjects = new object[targetObjects.Length];
for (var i = 0; i < targetObjects.Length; i++)
{
parentObjects[i] = causer.GetDeclaringObject(targetObjects[i]);
var targetObject = targetObjects[i];
parentObjects[i] = causer.GetDeclaringObject(targetObject);
}

return TryGetValue(source, parentObjects, out value, out hasMixedValues, nextValuesComparer);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using UnityEditor;
using UnityEngine;

namespace Toolbox.Editor.Drawers
{
public class DisableInEditModeAttributeDrawer : ToolboxConditionDrawer<DisableInEditModeAttribute>
{
protected override PropertyCondition OnGuiValidateSafe(SerializedProperty property, DisableInEditModeAttribute attribute)
{
return !EditorApplication.isPlayingOrWillChangePlaymode ? PropertyCondition.Disabled : PropertyCondition.Valid;
}
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ public enum HierarchyItemDataType
Toggle,
Tag,
Layer,
Script
Script,
TreeLines
}
}
Loading

0 comments on commit 6e0f089

Please sign in to comment.