[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52889] trunk/blender/source/blender: fix for warnings/errors in recent commits

[Campbell Barton]

Revision: 52889
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52889
Author:   campbellbarton
Date:     2012-12-11 15:06:51 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
fix for warnings/errors in recent commits

Modified Paths:
--------------
    trunk/blender/source/blender/collada/collada_internal.cpp
    trunk/blender/source/blender/collada/collada_internal.h
    trunk/blender/source/blender/editors/space_view3d/view3d_edit.c

Modified: trunk/blender/source/blender/collada/collada_internal.cpp
===================================================================
--- trunk/blender/source/blender/collada/collada_internal.cpp	2012-12-11 14:45:38 UTC (rev 52888)
+++ trunk/blender/source/blender/collada/collada_internal.cpp	2012-12-11 15:06:51 UTC (rev 52889)
@@ -91,7 +91,7 @@
 	transpose_m4(out);
 }
 
-void UnitConverter::mat4_to_dae_double(double out[4][4], float in[4][4])
+void UnitConverter::mat4_to_dae_double(double out[4][4], float const in[4][4])
 {
 	float mat[4][4];
 

Modified: trunk/blender/source/blender/collada/collada_internal.h
===================================================================
--- trunk/blender/source/blender/collada/collada_internal.h	2012-12-11 14:45:38 UTC (rev 52888)
+++ trunk/blender/source/blender/collada/collada_internal.h	2012-12-11 15:06:51 UTC (rev 52889)
@@ -71,9 +71,9 @@
 
 	void dae_matrix_to_mat4_(float out[4][4], const COLLADABU::Math::Matrix4& in);
 
-	void mat4_to_dae(float out[4][4], float in[4][4]);
+	void mat4_to_dae(float out[4][4], float const in[4][4]);
 
-	void mat4_to_dae_double(double out[4][4], float in[4][4]);
+	void mat4_to_dae_double(double out[4][4], float const in[4][4]);
 };
 
 class TransformBase

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2012-12-11 14:45:38 UTC (rev 52888)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c	2012-12-11 15:06:51 UTC (rev 52889)
@@ -3992,7 +3992,7 @@
 	
 	/* problem - ofs[3] can be on same location as camera itself. 
 	   Blender needs proper dist value for zoom */
-	if ( fabs(dist) <= FLT_EPSILON) {
+	if (fabsf(dist) <= FLT_EPSILON) {
 		return 1.0f;
 	}
 	return dist;