From 8054372d22310bad504012ca70a692ad9dc94973 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 30 Oct 2014 10:26:22 +0100 Subject: Fix negate_m3 (taking 4x4 matrix) Cycles bake used incorrectly. --- source/blender/blenlib/BLI_math_matrix.h | 2 +- source/blender/blenlib/intern/math_matrix.c | 2 +- source/blender/editors/object/object_bake_api.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/blender/blenlib/BLI_math_matrix.h b/source/blender/blenlib/BLI_math_matrix.h index 732f4b66f38..e58e42f3c2d 100644 --- a/source/blender/blenlib/BLI_math_matrix.h +++ b/source/blender/blenlib/BLI_math_matrix.h @@ -125,7 +125,7 @@ void mul_m3_fl(float R[3][3], float f); 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[4][4]); +void negate_m3(float R[3][3]); void negate_m4(float R[4][4]); bool invert_m3_ex(float m[3][3], const float epsilon); diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c index af42af88582..6b40f0cf28e 100644 --- a/source/blender/blenlib/intern/math_matrix.c +++ b/source/blender/blenlib/intern/math_matrix.c @@ -639,7 +639,7 @@ void mul_mat3_m4_fl(float m[4][4], float f) m[i][j] *= f; } -void negate_m3(float m[4][4]) +void negate_m3(float m[3][3]) { int i, j; diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 5746f9efd56..4821ffd4119 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -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_m3(highpoly[i].rotmat); + negate_m4(highpoly[i].rotmat); i++; } -- cgit v1.2.3