From 90eec891254502ec64c98184ca2dcd6333311660 Mon Sep 17 00:00:00 2001 From: Gaia Clary Date: Tue, 30 Jul 2013 07:32:37 +0000 Subject: Collada: renamed size_mat to scale_mat for clarity. removed obsolete variable definition --- source/blender/collada/collada_internal.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'source/blender/collada/collada_internal.cpp') diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp index 5f99434c43f..567ee22b3d6 100644 --- a/source/blender/collada/collada_internal.cpp +++ b/source/blender/collada/collada_internal.cpp @@ -40,7 +40,7 @@ UnitConverter::UnitConverter() : unit(), up_axis(COLLADAFW::FileInfo::Z_UP) rotate_m4(y_up_mat4, 'X', 0.5 * M_PI); unit_m4(z_up_mat4); - unit_m4(size_mat4); + unit_m4(scale_mat4); } void UnitConverter::read_asset(const COLLADAFW::FileInfo *asset) @@ -127,7 +127,7 @@ float(&UnitConverter::get_rotation())[4][4] float(&UnitConverter::get_scale())[4][4] { - return size_mat4; + return scale_mat4; } void UnitConverter::calculate_scale(Scene &sce) @@ -160,13 +160,10 @@ void UnitConverter::calculate_scale(Scene &sce) break; } - float axis_mat4[4][4]; - unit_m4(axis_mat4); - float rescale[3]; rescale[0] = rescale[1] = rescale[2] = getLinearMeter() / bl_scale; - size_to_mat4(size_mat4, rescale); + size_to_mat4(scale_mat4, rescale); } void TransformBase::decompose(float mat[4][4], float *loc, float eul[3], float quat[4], float *size) -- cgit v1.2.3