diff --git a/polymer/eduke32/build/src/polymer.c b/polymer/eduke32/build/src/polymer.c
index 5f075e7e8..09c4bba22 100644
--- a/polymer/eduke32/build/src/polymer.c
+++ b/polymer/eduke32/build/src/polymer.c
@@ -1107,18 +1107,18 @@ void                polymer_updatesprite(int32_t snum)
             i = j = 0;
             while (j < lightcount)
             {
-                while (!prlights[i].flags.active)
-                    i++;
-
-                if (prlights[i].priority != curpriority)
-                {
-                    i++;
-                    j++;
-                    continue;
-                }
+                while (!prlights[i].flags.active)
+                    i++;
+
+                if (prlights[i].priority != curpriority)
+                {
+                    i++;
+                    j++;
+                    continue;
+                }
 
                 if (polymer_planeinlight(&s->plane, &prlights[i]))
-                    polymer_addplanelight(&s->plane, i);
+                    polymer_addplanelight(&s->plane, i);
                 i++;
                 j++;
             }
@@ -1305,7 +1305,9 @@ void                polymer_drawsprite(int32_t snum)
     bglFogf(GL_FOG_DENSITY,fogresult);
     bglFogfv(GL_FOG_COLOR,fogcol);
 
-    if (usemodels && tile2model[Ptile2tile(tspr->picnum,tspr->pal)].modelid >= 0 && tile2model[Ptile2tile(tspr->picnum,tspr->pal)].framenum >= 0)
+    if (usemodels && tile2model[Ptile2tile(tspr->picnum,tspr->pal)].modelid >= 0 &&
+        tile2model[Ptile2tile(tspr->picnum,tspr->pal)].framenum >= 0 &&
+        !spriteext[tspr->owner].flags & SPREXT_NOTMD)
     {
         polymer_drawmdsprite(tspr);
         return;
@@ -1345,19 +1347,19 @@ void                polymer_drawsprite(int32_t snum)
             i = j = 0;
             while (j < lightcount)
             {
-                while (!prlights[i].flags.active)
-                    i++;
-
-                if (prlights[i].priority != curpriority)
-                {
-                    i++;
-                    j++;
-                    continue;
-                }
+                while (!prlights[i].flags.active)
+                    i++;
+
+                if (prlights[i].priority != curpriority)
+                {
+                    i++;
+                    j++;
+                    continue;
+                }
 
                 if (polymer_planeinlight(&s->plane, &prlights[i]))
-                    s->plane.lights[s->plane.lightcount++] = i;
-
+                    s->plane.lights[s->plane.lightcount++] = i;
+
                 i++;
                 j++;
             }
@@ -3647,15 +3649,15 @@ static void         polymer_drawmdsprite(spritetype *tspr)
             i = j = 0;
             while (j < lightcount)
             {
-                while (!prlights[i].flags.active)
-                    i++;
-
-                if (prlights[i].priority != curpriority)
-                {
-                    i++;
-                    j++;
-                    continue;
-                }
+                while (!prlights[i].flags.active)
+                    i++;
+
+                if (prlights[i].priority != curpriority)
+                {
+                    i++;
+                    j++;
+                    continue;
+                }
 
                 lradius = prlights[i].range / 1000.0f;