Complementary fix for rB8054372: Follow the common naming scheme by

using negate_mat3_m4 instead of negate_m4.

This avoids changing the behavior and only flips the 3x3 part of the
matrix.
This commit is contained in:
2014-10-30 15:26:41 +01:00
parent f07cd77b48
commit af9da0be43
3 changed files with 11 additions and 1 deletions

View File

@@ -126,6 +126,7 @@ void mul_m4_fl(float R[4][4], float f);
void mul_mat3_m4_fl(float R[4][4], float f);
void negate_m3(float R[3][3]);
void negate_mat3_m4(float R[4][4]);
void negate_m4(float R[4][4]);
bool invert_m3_ex(float m[3][3], const float epsilon);

View File

@@ -648,6 +648,15 @@ void negate_m3(float m[3][3])
m[i][j] *= -1.0f;
}
void negate_mat3_m4(float m[4][4])
{
int i, j;
for (i = 0; i < 3; i++)
for (j = 0; j < 3; j++)
m[i][j] *= -1.0f;
}
void negate_m4(float m[4][4])
{
int i, j;

View File

@@ -768,7 +768,7 @@ static int bake(
normalize_m4_m4(highpoly[i].rotmat, highpoly[i].imat);
zero_v3(highpoly[i].rotmat[3]);
if (is_negative_m4(highpoly[i].rotmat))
negate_m4(highpoly[i].rotmat);
negate_mat3_m4(highpoly[i].rotmat);
i++;
}