- reinstated code that has gotten lost.

Fixes texture trimming.

src/common/textures/gametexture.cpp

@@ -311,7 +311,7 @@ void FGameTexture::SetupSpriteData()
 
 		if (i == 1 && ShouldExpandSprite())
 		{
-			spi.mTrimResult = Base->TrimBorders(spi.trim);	// get the trim size before adding the empty frame
+			spi.mTrimResult = Base->TrimBorders(spi.trim) && !GetNoTrimming();	// get the trim size before adding the empty frame
 			spi.spriteWidth += 2;
 			spi.spriteHeight += 2;
 		}