Squashed commit of the following:

commit e5bcd6c
Author: Jon McCreadie <[email protected]>
Date:   Tue Mar 19 15:55:01 2024 +0000

    Update GizmoTool.cs

    Add method that returns the correct mesh to draw and pass it to the relevant gizmo functions.

commit 389cf2f
Author: Jon McCreadie <[email protected]>
Date:   Tue Mar 19 15:53:16 2024 +0000

    Update GizmoDrawerInspector.cs

    * Add new serialized property.
    * Fix spelling mistake.
    * Add logic to show relevant mesh options.

commit 1eddbce
Author: Jon McCreadie <[email protected]>
Date:   Tue Mar 19 15:50:38 2024 +0000

    Update GizmoDrawer.cs

    Add use mesh on filter bool.

Author: FrayedFunction

Editor/GizmoDrawer.cs

@@ -29,6 +29,7 @@ public class GizmoDrawer : MonoBehaviour
         [HideInInspector] public Mesh mesh;
         [HideInInspector] public Vector3 meshRotation;
         [HideInInspector] public bool useAttachedTransformValues;
+        [HideInInspector] public bool useMeshOnFilter;
         //Line
         [HideInInspector] public Transform targetTransform;
         [HideInInspector] public Vector3 targetPosition;

Editor/GizmoDrawerInspector.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 using UnityEditor;
+using System.Runtime.CompilerServices;
 
 namespace MccDev260.GizmoTool
 {
@@ -31,7 +32,8 @@ public class GizmoDrawerInspector : Editor
             serProp_screenRect,
             serProp_texture,
             serProp_mat,
-            serProp_useTransfromVals;
+            serProp_useTransformVals,
+            serProp_useMeshOnFilter;
         #endregion
 
         GizmoDrawer gizmoDrawer;
@@ -67,7 +69,8 @@ private void OnEnable()
             serProp_texture = serializedObject.FindProperty("texture");
             serProp_mat = serializedObject.FindProperty("mat");
 
-            serProp_useTransfromVals = serializedObject.FindProperty("useAttachedTransformValues");
+            serProp_useTransformVals = serializedObject.FindProperty("useAttachedTransformValues");
+            serProp_useMeshOnFilter = serializedObject.FindProperty("useMeshOnFilter");
         }
 
         public override void OnInspectorGUI()
@@ -142,10 +145,19 @@ static void DrawInspector(GizmoType type, GizmoDrawerInspector editor, out bool
                     showSingleOrigin = true;
                     showColour = true;
 
-                    EditorGUILayout.PropertyField(editor.serProp_mesh);
-                    EditorGUILayout.PropertyField(editor.serProp_useTransfromVals);
+                    if (ShowMeshOptions(editor.gizmoDrawer))
+                    {
+                        EditorGUILayout.PropertyField(editor.serProp_mesh);
+                    }
+
+                    if (editor.gizmoDrawer.transform.GetComponent<MeshFilter>())
+                    {
+                        EditorGUILayout.PropertyField(editor.serProp_useMeshOnFilter);
+                    }
+
+                    EditorGUILayout.PropertyField(editor.serProp_useTransformVals);
 
-                    if (editor.serProp_useTransfromVals.boolValue == true) return;
+                    if (editor.serProp_useTransformVals.boolValue == true) return;
 
                     EditorGUILayout.PropertyField(editor.serProp_meshRot);
                     EditorGUILayout.PropertyField(editor.serProp_vec3Scale);
@@ -205,6 +217,14 @@ static bool ShowOriginOptions(GizmoDrawer drawer)
 
             return true;
         }
+
+        static bool ShowMeshOptions(GizmoDrawer drawer)
+        {
+            if (drawer.GetComponent<MeshFilter>() && drawer.useMeshOnFilter)
+                return false;
+
+            return true;
+        }
     }
 #endif
 }

Editor/GizmoTool.cs

@@ -56,14 +56,14 @@ internal static void DrawGizmo(GizmoDrawer drawer)
                     if (drawer.useAttachedTransformValues)
                         drawer.originTransform = drawer.transform;
 
-                    Gizmos.DrawMesh(drawer.mesh, OriginPosition(drawer), MeshRotation(drawer), MeshScale(drawer), drawer.gizmoColor);
+                    Gizmos.DrawMesh(GetMesh(drawer), OriginPosition(drawer), MeshRotation(drawer), MeshScale(drawer), drawer.gizmoColor);
                     break;
 
                 case GizmoType.WireMesh:
                     if (drawer.useAttachedTransformValues)
                         drawer.originTransform = drawer.transform;
 
-                    Gizmos.DrawWireMesh(drawer.mesh, OriginPosition(drawer), MeshRotation(drawer), MeshScale(drawer), drawer.gizmoColor);
+                    Gizmos.DrawWireMesh(GetMesh(drawer), OriginPosition(drawer), MeshRotation(drawer), MeshScale(drawer), drawer.gizmoColor);
                     break;
 
                 case GizmoType.Line:
@@ -154,6 +154,18 @@ static Vector3 MeshScale(GizmoDrawer drawer)
 
             return drawer.scale;
         }
+
+        static Mesh GetMesh(GizmoDrawer drawer) 
+        {
+            var filter = drawer.transform.GetComponent<MeshFilter>();
+
+            if (filter && drawer.useMeshOnFilter)
+            {
+                return filter.sharedMesh;
+            }
+
+            return drawer.mesh;
+        }
     }
 }
 #endif