Skip to content

Commit

Permalink
chore: fix compile warnings (#853)
Browse files Browse the repository at this point in the history
  • Loading branch information
bdunderscore committed May 12, 2024
1 parent 1c0be75 commit c9db3de
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Editor/Inspector/BlendshapeSyncEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ private void OnDisable()
if (_window != null) DestroyImmediate(_window);
}

protected virtual void OnDestroy()
protected override void OnDestroy()
{
base.OnDestroy();
if (_window != null) DestroyImmediate(_window);
Expand Down
2 changes: 2 additions & 0 deletions Editor/Inspector/MoveIndependently/MoveIndependentlyEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ protected override void OnInnerInspectorGUI()

protected override VisualElement CreateInnerInspectorGUI()
{
#pragma warning disable CS0618 // Type or member is obsolete
var root = uxml.Localize();
#pragma warning restore CS0618 // Type or member is obsolete
root.styleSheets.Add(uss);

var container = root.Q<VisualElement>("group-container");
Expand Down
2 changes: 1 addition & 1 deletion Editor/OptimizationPasses/GCGameObjectsPass.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ private void MarkAll()
}
}
}
catch (MissingComponentException e)
catch (MissingComponentException _)
{
// No animator? weird. Move on.
}
Expand Down
6 changes: 1 addition & 5 deletions Editor/RenameParametersHook.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ internal class RenameParametersHook

private BuildContext _context;

private int internalParamIndex = 0;

// TODO: Move into NDMF
private ImmutableList<string> PhysBoneSuffixes = ImmutableList<string>.Empty
.Add("_IsGrabbed")
Expand Down Expand Up @@ -325,13 +323,11 @@ GameObject obj
{
rv = BuildReport.ReportingObject(p, () => CollectParameters(p, paramInfo.GetParameterRemappingsAt(p, true)));
}

var willPurgeAnimators = false;

foreach (var merger in obj.GetComponents<ModularAvatarMergeAnimator>())
{
if (merger.deleteAttachedAnimator)
{
willPurgeAnimators = true;
break;
}
}
Expand Down
1 change: 0 additions & 1 deletion Runtime/ArmatureAwase/ArmatureLockJob.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ internal sealed class ArmatureLockJob : IDisposable
private Action _dispose;

private bool _isValid = true;
private long _lastHierarchyCheck = -1;
private Action _update;

internal ImmutableList<(Transform, Transform)> RecordedParents;
Expand Down
7 changes: 1 addition & 6 deletions Runtime/ScaleAdjuster/ScaleProxy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,11 @@ namespace nadena.dev.modular_avatar.core
internal sealed class ScaleProxy : AvatarTagComponent
{
#if UNITY_EDITOR
void OnValidate()
protected override void OnValidate()
{
base.OnValidate();
EditorApplication.delayCall += DeferredValidate;
}

void OnDestroy()
{
base.OnDestroy();
}

private void DeferredValidate()
{
Expand Down

0 comments on commit c9db3de

Please sign in to comment.