diff options
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 637bb085aa2..7e27106a82f 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3809,7 +3809,7 @@ static void direct_link_mdisps(FileData *fd, int count, MDisps *mdisps, int exte * overwritten with the correct value in * bm_corners_to_loops() */ float gridsize = sqrtf(mdisps[i].totdisp); - mdisps[i].level = (int)(logf(gridsize - 1.0f) / M_LN2) + 1; + mdisps[i].level = (int)(logf(gridsize - 1.0f) / (float)M_LN2) + 1; } if ( (fd->flags & FD_FLAGS_SWITCH_ENDIAN) && (mdisps[i].disps) ) { @@ -3908,7 +3908,7 @@ static void direct_link_mesh(FileData *fd, Mesh *mesh) if (mesh->mpoly) { /* be clever and load polygons as mfaces */ - mesh->totface= mesh_mpoly_to_mface(&mesh->fdata, &mesh->ldata, &mesh->pdata, + mesh->totface= BKE_mesh_mpoly_to_mface(&mesh->fdata, &mesh->ldata, &mesh->pdata, mesh->totface, mesh->totloop, mesh->totpoly); CustomData_free(&mesh->pdata, mesh->totpoly); @@ -7406,7 +7406,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) Curve *cu; for (la= main->lamp.first; la; la= la->id.next) { - if (la->shadow_frustum_size == 0.0) + if (la->shadow_frustum_size == 0.0f) la->shadow_frustum_size= 10.0f; } |