fix for warnings/errors in recent commits

3 files changed, 4 insertions, 4 deletions

diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp
index 0c95cd6a31a..13ff69d3abf 100644
--- a/source/blender/collada/collada_internal.cpp
+++ b/source/blender/collada/collada_internal.cpp
@@ -91,7 +91,7 @@ void UnitConverter::mat4_to_dae(float out[4][4], float const in[4][4])
 	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];
 
diff --git a/source/blender/collada/collada_internal.h b/source/blender/collada/collada_internal.h
index d92f53f714c..5a5126025de 100644
--- a/source/blender/collada/collada_internal.h
+++ b/source/blender/collada/collada_internal.h
@@ -71,9 +71,9 @@ public:
 
 	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
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 231a8d3dcf2..d0783419fe8 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -3992,7 +3992,7 @@ float ED_view3d_offset_distance(float mat[4][4], float ofs[3])
 	
 	/* 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;