add a new object member to store the dsize, since with my recent commit broke forward compatibility. now the new values are copied into 'dscale' and existing ones remain.

this is annoying since now we have dsize and dscale, will look into a way to deprecate struct members next.

1 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c
index b2c9a5706a3..37cb49fc17b 100644
--- a/source/blender/blenlib/intern/math_matrix.c
+++ b/source/blender/blenlib/intern/math_matrix.c
@@ -1121,18 +1121,18 @@ void blend_m3_m3m3(float out[][3], float dst[][3], float src[][3], const float s
 {
 	float srot[3][3], drot[3][3];
 	float squat[4], dquat[4], fquat[4];
-	float ssize[3], dsize[3], fsize[3];
+	float sscale[3], dscale[3], fsize[3];
 	float rmat[3][3], smat[3][3];
 	
-	mat3_to_rot_size(drot, dsize, dst);
-	mat3_to_rot_size(srot, ssize, src);
+	mat3_to_rot_size(drot, dscale, dst);
+	mat3_to_rot_size(srot, sscale, src);
 
 	mat3_to_quat(dquat, drot);
 	mat3_to_quat(squat, srot);
 
 	/* do blending */
 	interp_qt_qtqt(fquat, dquat, squat, srcweight);
-	interp_v3_v3v3(fsize, dsize, ssize, srcweight);
+	interp_v3_v3v3(fsize, dscale, sscale, srcweight);
 
 	/* compose new matrix */
 	quat_to_mat3(rmat,fquat);
@@ -1145,10 +1145,10 @@ void blend_m4_m4m4(float out[][4], float dst[][4], float src[][4], const float s
 	float sloc[3], dloc[3], floc[3];
 	float srot[3][3], drot[3][3];
 	float squat[4], dquat[4], fquat[4];
-	float ssize[3], dsize[3], fsize[3];
+	float sscale[3], dscale[3], fsize[3];
 
-	mat4_to_loc_rot_size(dloc, drot, dsize, dst);
-	mat4_to_loc_rot_size(sloc, srot, ssize, src);
+	mat4_to_loc_rot_size(dloc, drot, dscale, dst);
+	mat4_to_loc_rot_size(sloc, srot, sscale, src);
 
 	mat3_to_quat(dquat, drot);
 	mat3_to_quat(squat, srot);
@@ -1156,7 +1156,7 @@ void blend_m4_m4m4(float out[][4], float dst[][4], float src[][4], const float s
 	/* do blending */
 	interp_v3_v3v3(floc, dloc, sloc, srcweight);
 	interp_qt_qtqt(fquat, dquat, squat, srcweight);
-	interp_v3_v3v3(fsize, dsize, ssize, srcweight);
+	interp_v3_v3v3(fsize, dscale, sscale, srcweight);
 
 	/* compose new matrix */
 	loc_quat_size_to_mat4(out, floc, fquat, fsize);