diff options
author | Campbell Barton <campbell@blender.org> | 2022-09-25 10:04:52 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-09-25 11:26:27 +0300 |
commit | 891949cbb47143420f4324cb60efc05ef5d70b39 (patch) | |
tree | fe70a45612ae96f9ce1f37378ef5ff035d3127f5 /source/blender/io/wavefront_obj | |
parent | c9e35c2ced92082c86f1ecb9ecd16c6230218c7c (diff) |
Cleanup: use 'u' prefixed integer types for brevity & cast style
To use function style cast '(unsigned char)x' can't be replaced by
'unsigned char(x)'.
Diffstat (limited to 'source/blender/io/wavefront_obj')
-rw-r--r-- | source/blender/io/wavefront_obj/exporter/obj_export_mtl.cc | 2 | ||||
-rw-r--r-- | source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mtl.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mtl.cc index f8c7da75a70..851358f8762 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_mtl.cc +++ b/source/blender/io/wavefront_obj/exporter/obj_export_mtl.cc @@ -153,7 +153,7 @@ static std::string get_image_filepath(const bNode *tex_node) if (tex_image->source == IMA_SRC_SEQUENCE) { char head[FILE_MAX], tail[FILE_MAX]; - unsigned short numlen; + ushort numlen; int framenr = static_cast<NodeTexImage *>(tex_node->storage)->iuser.framenr; BLI_path_sequence_decode(path, head, tail, &numlen); BLI_path_sequence_encode(path, head, tail, numlen, framenr); diff --git a/source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc b/source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc index efa6473b494..56fe81181e3 100644 --- a/source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc +++ b/source/blender/io/wavefront_obj/importer/obj_import_file_reader.cc @@ -106,7 +106,7 @@ static void geom_add_mrgb_colors(const char *p, const char *end, GlobalVertices if (ELEM(res.ec, std::errc::invalid_argument, std::errc::result_out_of_range)) { return; } - unsigned char srgb[4]; + uchar srgb[4]; srgb[0] = (value >> 16) & 0xFF; srgb[1] = (value >> 8) & 0xFF; srgb[2] = value & 0xFF; |