Collada: renamed size_mat to scale_mat for clarity. removed obsolete variable definition
authorGaia Clary <gaia.clary@machinimatrix.org>
Tue, 30 Jul 2013 07:32:37 +0000 (07:32 +0000)
committerGaia Clary <gaia.clary@machinimatrix.org>
Tue, 30 Jul 2013 07:32:37 +0000 (07:32 +0000)
source/blender/collada/collada_internal.cpp
source/blender/collada/collada_internal.h

index 5f99434c43f724dac0a730bb095d0cc7dd65afd9..567ee22b3d62cf5c8d34644e67f7ba6bafd94bb7 100644 (file)
@@ -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)
index c546b13d4339cbb7c47ff7eb14a43f03f68c032a..4aa637a687639a8d796e514fbbe4b581311d3352 100644 (file)
@@ -50,7 +50,7 @@ private:
        float x_up_mat4[4][4];
        float y_up_mat4[4][4];
        float z_up_mat4[4][4];
-       float size_mat4[4][4];
+       float scale_mat4[4][4];
        
 public: