Merge branch 'master' into bugfix/edge-hover-selection-fix

Author: varinotmUnity

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Fixed
 
 - [PBLD-242] Fixed a bug where edges were being incorrectly selected when one or both vertices were behind the camera's near plane, causing flipped lines and inconsistent selection behavior.
+- [PBLD-226] Fixed a bug where ProBuilder faces could not selected when obscured by another GameObject
 
 ## [6.0.6] - 2025-07-01
 
@@ -27,6 +28,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - [PBLD-222] Fixed crash by preventing user from probuilderizing a gameobject that has isPartOfStaticBatch set to true.
 - [PBLD-245] Fixed warnings about obsolete API usage when using Unity 6.2 and later. Updated the API usage where the alternatives were available in Unity 2022.3.
 
+
 ## [6.0.5] - 2025-03-11
 
 ### Changes

Editor/EditorCore/EditorSceneViewPicker.cs

@@ -406,28 +406,32 @@ internal static float MouseRayHitTest(
             return FaceRaycast(mousePosition, pickerOptions, allowUnselected, selection, 0, true);
         }
 
+        static List<(ProBuilderMesh mesh, Face face, float dist, int hash)> s_PbHits = new List<(ProBuilderMesh, Face, float, int)>();
+
         static float FaceRaycast(Vector3 mousePosition,
             ScenePickerPreferences pickerOptions,
             bool allowUnselected,
             SceneSelection selection,
             int deepClickOffset = 0,
             bool isPreview = true)
         {
-            GameObject pickedGo = null;
-            ProBuilderMesh pickedPb = null;
-            Face pickedFace = null;
-
-            int newHash = 0;
+            GameObject candidateGo = null;
+            ProBuilderMesh candidatePb = null;
+            Face        candidateFace = null;
+            float       candidateDistance = Mathf.Infinity;
+            float       resultDistance = Mathf.Infinity;
 
             // If any event modifiers are engaged don't cycle the deep click
-            EventModifiers em = Event.current.modifiers;
+            EventModifiers em = EventModifiers.None;
+            if (Event.current != null)
+                em = Event.current.modifiers;
 
             // Reset cycle if we used an event modifier previously.
             // Move state back to single selection.
             if ((em != EventModifiers.None) != s_AppendModifierPreviousState)
             {
                 s_AppendModifierPreviousState = (em != EventModifiers.None);
-                s_DeepSelectionPrevious = newHash;
+                s_DeepSelectionPrevious = 0;
             }
 
             if (isPreview || em != EventModifiers.None)
@@ -437,13 +441,11 @@ static float FaceRaycast(Vector3 mousePosition,
 
             selection.Clear();
 
-            float distance = Mathf.Infinity;
-
-            for (int i = 0, next = 0, pickedCount = s_OverlappingGameObjects.Count; i < pickedCount; i++)
+            // First, find all ProBuilder meshes and their hit faces under the mouse
+            for (int i = 0, pickedCount = s_OverlappingGameObjects.Count; i < pickedCount; i++)
             {
                 var go = s_OverlappingGameObjects[i];
                 var mesh = go.GetComponent<ProBuilderMesh>();
-                Face face = null;
 
                 if (mesh != null && (allowUnselected || MeshSelection.topInternal.Contains(mesh)))
                 {
@@ -456,59 +458,91 @@ static float FaceRaycast(Vector3 mousePosition,
                             Mathf.Infinity,
                             pickerOptions.cullMode))
                     {
-                        face = mesh.facesInternal[hit.face];
-                        distance = Vector2.SqrMagnitude(((Vector2)mousePosition) - HandleUtility.WorldToGUIPoint(mesh.transform.TransformPoint(hit.point)));
+                        Face face = mesh.facesInternal[hit.face];
+                        float dist = Vector2.SqrMagnitude(((Vector2)mousePosition) - HandleUtility.WorldToGUIPoint(mesh.transform.TransformPoint(hit.point)));
+                        s_PbHits.Add((mesh, face, dist, face.GetHashCode()));
                     }
                 }
+            }
 
-                // pb_Face doesn't define GetHashCode, meaning it falls to object.GetHashCode (reference comparison)
-                int hash = face == null ? go.GetHashCode() : face.GetHashCode();
+            if (s_PbHits.Count > 0)
+            {
+                // Sort ProBuilder hits by distance (closest first)
+                s_PbHits.Sort((a, b) => a.dist.CompareTo(b.dist));
 
-                if (s_DeepSelectionPrevious == hash)
-                    next = (i + (1 + deepClickOffset)) % pickedCount;
+                int chosenIndex = 0;
 
-                if (next == i)
+                // Apply deep click cycling logic only if it's an actual click and a previous selection exists
+                if (!isPreview && s_DeepSelectionPrevious != 0)
                 {
-                    pickedGo = go;
-                    pickedPb = mesh;
-                    pickedFace = face;
+                    int currentSelectionIndex = -1;
+                    // Find the index of the previously selected item (if it's still in the list)
+                    for (int i = 0; i < s_PbHits.Count; i++)
+                    {
+                        if (s_PbHits[i].hash == s_DeepSelectionPrevious)
+                        {
+                            currentSelectionIndex = i;
+                            break;
+                        }
+                    }
+
+                    if (currentSelectionIndex != -1)
+                    {
+                        // Calculate the next index for cycling
+                        chosenIndex = (currentSelectionIndex + (1 + deepClickOffset)) % s_PbHits.Count;
+                        // Handle negative result from modulo for deepClickOffset = -1 if currentSelectionIndex is 0
+                        if (chosenIndex < 0) chosenIndex += s_PbHits.Count;
+                    }
+                    // If s_DeepSelectionPrevious was set but no matching PB hit is found in current list,
+                    // fall back to the closest one (chosenIndex remains 0)
+                }
+                // else for first click or if s_DeepSelectionPrevious is 0, chosenIndex remains 0 (selects closest)
 
-                    newHash = hash;
+                var selectedHit = s_PbHits[chosenIndex];
+                candidateGo = selectedHit.mesh.gameObject;
+                candidatePb = selectedHit.mesh;
+                candidateFace = selectedHit.face;
+                candidateDistance = selectedHit.dist;
 
-                    // a prior hash was matched, this is the next. if
-                    // it's just the first iteration don't break (but do
-                    // set the default).
-                    if (next != 0)
-                        break;
+                // Update s_DeepSelectionPrevious only for actual clicks after cycling/filtering (not hovers)
+                if (!isPreview)
+                {
+                    s_DeepSelectionPrevious = selectedHit.hash;
+                }
+            }
+            else // No ProBuilder meshes were hit, fallback to standard GameObject picking
+            {
+                // This means the mouse is over a non-ProBuilder GameObject, or nothing at all.
+                // We should still allow picking of that topmost non-ProBuilder GameObject.
+                GameObject topmostGo = HandleUtility.PickGameObject(mousePosition, false);
+                if (topmostGo != null)
+                {
+                    candidateGo = topmostGo;
+                    candidateDistance = 0f; // Indicate a direct hit (distance not relevant for non-PB pick)
+                    s_DeepSelectionPrevious = 0; // Reset deep selection if a non-PB object is picked
                 }
             }
 
-            if (!isPreview)
-                s_DeepSelectionPrevious = newHash;
-
-            if (pickedGo != null)
+            // Final selection update
+            if (candidateGo != null)
             {
-                Event.current.Use();
+                Event.current?.Use();
+
+                selection.gameObject = candidateGo;
+                resultDistance = Mathf.Sqrt(candidateDistance);
 
-                if (pickedPb != null)
+                if (candidatePb != null)
                 {
-                    if (pickedPb.selectable)
+                    if (candidatePb.selectable)
                     {
-                        selection.gameObject = pickedGo;
-                        selection.mesh = pickedPb;
-                        selection.SetSingleFace(pickedFace);
-
-                        return Mathf.Sqrt(distance);
+                        selection.mesh = candidatePb;
+                        selection.SetSingleFace(candidateFace);
                     }
                 }
-
-                // If clicked off a pb_Object but onto another gameobject, set the selection
-                // and dip out.
-                selection.gameObject = pickedGo;
-                return Mathf.Sqrt(distance);
             }
 
-            return distance;
+            s_PbHits.Clear();
+            return resultDistance;
         }
 
         static float VertexRaycast(Vector3 mousePosition, ScenePickerPreferences pickerOptions, bool allowUnselected, SceneSelection selection)

Tests/Editor/Export/ExportObj.cs

@@ -80,6 +80,8 @@ public static void ExportSingleCube_CreatesUnityReadableMeshFile(
 
         Assume.That(imported, Is.Not.Null);
         Assert.That(imported.vertexCount, Is.GreaterThan(0));
+
+        Object.DestroyImmediate(cube.gameObject);
     }
 
     [Test]
@@ -108,13 +110,17 @@ public static void ExportSingleCube_CreatesTextureFile()
         Assert.That(meshRenderer.sharedMaterials[0].mainTexture, Is.Not.Null);
         var mainTex = meshRenderer.sharedMaterials[0].mainTexture;
         Assert.That(AssetDatabase.GetAssetPath(mainTex), Is.EqualTo(TestUtility.temporarySavedAssetsDirectory+mainTex.name+".png"));
+
+        Object.DestroyImmediate(cube.gameObject);
     }
 
     [Test]
     public static void ExportMultipleMeshes_CreatesModelWithTwoGroups()
     {
-        var cube1 = new Model("Cube A", ShapeFactory.Instantiate<Cube>());
-        var cube2 = new Model("Cube B", ShapeFactory.Instantiate<Cube>());
+        var cubeA = ShapeFactory.Instantiate<Cube>();
+        var cubeB = ShapeFactory.Instantiate<Cube>();
+        var cube1 = new Model("Cube A", cubeA);
+        var cube2 = new Model("Cube B", cubeB);
         string exportedPath = TestUtility.temporarySavedAssetsDirectory + "ObjGroup.obj";
 
         UnityEditor.ProBuilder.Actions.ExportObj.DoExport(exportedPath, new Model[] { cube1, cube2 }, new ObjOptions()
@@ -133,5 +139,8 @@ public static void ExportMultipleMeshes_CreatesModelWithTwoGroups()
         var all = AssetDatabase.LoadAllAssetRepresentationsAtPath(exportedPath);
 
         Assert.That(all.Count(x => x is Mesh), Is.EqualTo(2));
+
+        Object.DestroyImmediate(cubeA.gameObject);
+        Object.DestroyImmediate(cubeB.gameObject);
     }
 }