From 840e4b6f729e3b6e1d3e6e34db4d7b40759e64ae Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Mon, 19 Jun 2023 18:05:24 +0100
Subject: [PATCH] Push fix for #14890 down a level.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15005
---
 libs/kimath/src/geometry/shape_collisions.cpp | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/libs/kimath/src/geometry/shape_collisions.cpp b/libs/kimath/src/geometry/shape_collisions.cpp
index 99a6f3ae37..82a12abc92 100644
--- a/libs/kimath/src/geometry/shape_collisions.cpp
+++ b/libs/kimath/src/geometry/shape_collisions.cpp
@@ -785,6 +785,21 @@ inline bool CollCaseReversed ( const SHAPE* aA, const SHAPE* aB, int aClearance,
 static bool collideSingleShapes( const SHAPE* aA, const SHAPE* aB, int aClearance, int* aActual,
                                  VECTOR2I* aLocation, VECTOR2I* aMTV )
 {
+    if( aA->Type() == SH_POLY_SET )
+    {
+        const SHAPE_POLY_SET* polySetA = static_cast<const SHAPE_POLY_SET*>( aA );
+
+        wxASSERT( !aMTV );
+        return polySetA->Collide( aB, aClearance, aActual, aLocation );
+    }
+    else if( aB->Type() == SH_POLY_SET )
+    {
+        const SHAPE_POLY_SET* polySetB = static_cast<const SHAPE_POLY_SET*>( aB );
+
+        wxASSERT( !aMTV );
+        return polySetB->Collide( aA, aClearance, aActual, aLocation );
+    }
+
     switch( aA->Type() )
     {
     case SH_NULL:
@@ -1086,20 +1101,6 @@ static bool collideShapes( const SHAPE* aA, const SHAPE* aB, int aClearance, int
             }
         }
     }
-    else if( aA->Type() == SH_POLY_SET )
-    {
-        const SHAPE_POLY_SET* polySetA = static_cast<const SHAPE_POLY_SET*>( aA );
-
-        wxASSERT( !aMTV );
-        return polySetA->Collide( aB, aClearance, aActual, aLocation );
-    }
-    else if( aB->Type() == SH_POLY_SET )
-    {
-        const SHAPE_POLY_SET* polySetB = static_cast<const SHAPE_POLY_SET*>( aB );
-
-        wxASSERT( !aMTV );
-        return polySetB->Collide( aA, aClearance, aActual, aLocation );
-    }
     else
     {
         return collideSingleShapes( aA, aB, aClearance, aActual, aLocation, aMTV );