- Add a check to exclude ignored asseblies

- Move "Apply Modified Properties" button upper
ByronMayne · Aug 3, 2023 · b9819f9 · b9819f9
1 parent 1b07ef6
commit b9819f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Assets/Weaver/Editor/Inspectors/WeaverSettingsEditor.cs b/Assets/Weaver/Editor/Inspectors/WeaverSettingsEditor.cs
@@ -152,16 +152,17 @@ public override void OnInspectorGUI()
             {
                 _hasModifiedProperties = true;
             }
-            GUILayout.Label("Log", EditorStyles.boldLabel);
-            DrawLogs();
-
             if (_hasModifiedProperties)
             {
                 if (GUILayout.Button("Apply Modified Properties"))
                 {
                     ApplyModifiedProperties();
                 }
             }
+            GUILayout.Label("Log", EditorStyles.boldLabel);
+            DrawLogs();
+
+
         }
 
         private void ApplyModifiedProperties()

diff --git a/Assets/Weaver/Editor/Settings/WeaverSettings.cs b/Assets/Weaver/Editor/Settings/WeaverSettings.cs
@@ -221,6 +221,8 @@ private void WeaveAssembly(string assemblyPath)
             {
                 return;
             }
+            if (!this.m_WeavedAssemblies.Any(x => Path.GetFileName(x.GetSystemPath()) == Path.GetFileName(assemblyPath)))
+                return;
 
             string name = Path.GetFileNameWithoutExtension(assemblyPath);
-Original file line number
+Diff line change
@@ Expand Up / @@ -221,6 +221,8 @@ private void WeaveAssembly(string assemblyPath) @@
                 {
                     return;
                 }
+                if (!this.m_WeavedAssemblies.Any(x => Path.GetFileName(x.GetSystemPath()) == Path.GetFileName(assemblyPath)))
+                    return;
                 string name = Path.GetFileNameWithoutExtension(assemblyPath);
@@ Expand Down @@