diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 9917d6730ad..b8746a2cac8 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -401,12 +401,12 @@ _mesa_update_texture_matrices(struct gl_context *ctx)
    for (u = 0; u < ctx->Const.MaxTextureCoordUnits; u++) {
       assert(u < ARRAY_SIZE(ctx->TextureMatrixStack));
       if (_math_matrix_is_dirty(ctx->TextureMatrixStack[u].Top)) {
-	 _math_matrix_analyse( ctx->TextureMatrixStack[u].Top );
-
-	 if (ctx->Texture.Unit[u]._Current &&
-	     ctx->TextureMatrixStack[u].Top->type != MATRIX_IDENTITY)
-	    ctx->Texture._TexMatEnabled |= ENABLE_TEXMAT(u);
+         _math_matrix_analyse(ctx->TextureMatrixStack[u].Top);
       }
+
+      if (ctx->Texture.Unit[u]._Current &&
+          ctx->TextureMatrixStack[u].Top->type != MATRIX_IDENTITY)
+         ctx->Texture._TexMatEnabled |= ENABLE_TEXMAT(u);
    }
 
    if (old_texmat_enabled != ctx->Texture._TexMatEnabled)