diff options
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.cc | 4 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_300.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc index d627a93526e..fa9368db0d8 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -5111,12 +5111,12 @@ static void convert_pointer_array_64_to_32(BlendDataReader *reader, for (int i = 0; i < array_size; i++) { uint64_t ptr = src[i]; BLI_endian_switch_uint64(&ptr); - dst[i] = (uint32_t)(ptr >> 3); + dst[i] = uint32_t(ptr >> 3); } } else { for (int i = 0; i < array_size; i++) { - dst[i] = (uint32_t)(src[i] >> 3); + dst[i] = uint32_t(src[i] >> 3); } } } diff --git a/source/blender/blenloader/intern/versioning_300.cc b/source/blender/blenloader/intern/versioning_300.cc index 878a4078295..2203cf0bc9b 100644 --- a/source/blender/blenloader/intern/versioning_300.cc +++ b/source/blender/blenloader/intern/versioning_300.cc @@ -3034,9 +3034,9 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) gpmd->factor *= 2.0f; } else { - gpmd->step = 1 + (int)(gpmd->factor * max_ff(0.0f, - min_ff(5.1f * sqrtf(gpmd->step) - 3.0f, - gpmd->step + 2.0f))); + gpmd->step = 1 + int(gpmd->factor * max_ff(0.0f, + min_ff(5.1f * sqrtf(gpmd->step) - 3.0f, + gpmd->step + 2.0f))); gpmd->factor = 1.0f; } } |