fix a bug in analyse_from_scratch() reported by Wes Bethel
This commit is contained in:
@@ -1,16 +1,6 @@
|
|||||||
/**
|
|
||||||
* \file m_matrix.c
|
|
||||||
* Matrix operations.
|
|
||||||
*
|
|
||||||
* \note
|
|
||||||
* -# 4x4 transformation matrices are stored in memory in column major order.
|
|
||||||
* -# Points/vertices are to be thought of as column vectors.
|
|
||||||
* -# Transformation of a point p by a matrix M is: p' = M * p
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Mesa 3-D graphics library
|
* Mesa 3-D graphics library
|
||||||
* Version: 6.0.1
|
* Version: 6.2
|
||||||
*
|
*
|
||||||
* Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
|
* Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
|
||||||
*
|
*
|
||||||
@@ -33,6 +23,17 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \file m_matrix.c
|
||||||
|
* Matrix operations.
|
||||||
|
*
|
||||||
|
* \note
|
||||||
|
* -# 4x4 transformation matrices are stored in memory in column major order.
|
||||||
|
* -# Points/vertices are to be thought of as column vectors.
|
||||||
|
* -# Transformation of a point p by a matrix M is: p' = M * p
|
||||||
|
*/
|
||||||
|
|
||||||
|
|
||||||
#include "glheader.h"
|
#include "glheader.h"
|
||||||
#include "imports.h"
|
#include "imports.h"
|
||||||
#include "macros.h"
|
#include "macros.h"
|
||||||
@@ -1142,7 +1143,7 @@ static void analyse_from_scratch( GLmatrix *mat )
|
|||||||
mat->type = MATRIX_2D_NO_ROT;
|
mat->type = MATRIX_2D_NO_ROT;
|
||||||
|
|
||||||
if ((mask & MASK_NO_2D_SCALE) != MASK_NO_2D_SCALE)
|
if ((mask & MASK_NO_2D_SCALE) != MASK_NO_2D_SCALE)
|
||||||
mat->flags = MAT_FLAG_GENERAL_SCALE;
|
mat->flags |= MAT_FLAG_GENERAL_SCALE;
|
||||||
}
|
}
|
||||||
else if ((mask & MASK_2D) == (GLuint) MASK_2D) {
|
else if ((mask & MASK_2D) == (GLuint) MASK_2D) {
|
||||||
GLfloat mm = DOT2(m, m);
|
GLfloat mm = DOT2(m, m);
|
||||||
|
Reference in New Issue
Block a user