[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58735] trunk/blender/source/blender/ collada: Collada: renamed size_mat to scale_mat for clarity.

Gaia Clary gaia.clary at machinimatrix.org
Tue Jul 30 09:32:38 CEST 2013


Revision: 58735
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58735
Author:   gaiaclary
Date:     2013-07-30 07:32:37 +0000 (Tue, 30 Jul 2013)
Log Message:
-----------
Collada: renamed size_mat to scale_mat for clarity. removed obsolete variable definition

Modified Paths:
--------------
    trunk/blender/source/blender/collada/collada_internal.cpp
    trunk/blender/source/blender/collada/collada_internal.h

Modified: trunk/blender/source/blender/collada/collada_internal.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_internal.cpp	2013-07-30 07:22:40 UTC (rev 58734)
+++ trunk/blender/source/blender/collada/collada_internal.cpp	2013-07-30 07:32:37 UTC (rev 58735)
@@ -40,7 +40,7 @@
 	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_scale())[4][4]
 {
-	return size_mat4;
+	return scale_mat4;
 }
 
 void UnitConverter::calculate_scale(Scene &sce)
@@ -160,13 +160,10 @@
 			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)

Modified: trunk/blender/source/blender/collada/collada_internal.h
===================================================================
--- trunk/blender/source/blender/collada/collada_internal.h	2013-07-30 07:22:40 UTC (rev 58734)
+++ trunk/blender/source/blender/collada/collada_internal.h	2013-07-30 07:32:37 UTC (rev 58735)
@@ -50,7 +50,7 @@
 	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:
 




More information about the Bf-blender-cvs mailing list