Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for warnings/errors in recent commits

Browse Source
This commit is contained in:
Campbell Barton
2012-12-11 15:06:51 +00:00
parent cb116b42f4
commit 3520dd56e3
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/collada/collada_internal.cpp
View File

@@ -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];

4
source/blender/collada/collada_internal.h
View File

@@ -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

2
source/blender/editors/space_view3d/view3d_edit.c
View File

@@ -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;