Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-09-25 10:04:52 +0300
committerCampbell Barton <campbell@blender.org>2022-09-25 11:26:27 +0300
commit891949cbb47143420f4324cb60efc05ef5d70b39 (patch)
treefe70a45612ae96f9ce1f37378ef5ff035d3127f5 /source/blender/blenkernel/intern/customdata.cc
parentc9e35c2ced92082c86f1ecb9ecd16c6230218c7c (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/blenkernel/intern/customdata.cc')
-rw-r--r--source/blender/blenkernel/intern/customdata.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc
index 51c3b405ebc..86be7ba8e7c 100644
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@ -646,7 +646,7 @@ static void layerCopy_mdisps(const void *source, void *dest, const int count)
for (int i = 0; i < count; i++) {
if (s[i].disps) {
d[i].disps = static_cast<float(*)[3]>(MEM_dupallocN(s[i].disps));
- d[i].hidden = static_cast<unsigned int *>(MEM_dupallocN(s[i].hidden));
+ d[i].hidden = static_cast<uint *>(MEM_dupallocN(s[i].hidden));
}
else {
d[i].disps = nullptr;
@@ -832,7 +832,7 @@ static void layerCopyValue_mloopcol(const void *source,
{
const MLoopCol *m1 = static_cast<const MLoopCol *>(source);
MLoopCol *m2 = static_cast<MLoopCol *>(dest);
- unsigned char tmp_col[4];
+ uchar tmp_col[4];
if (ELEM(mixmode,
CDT_MIX_NOMIX,
@@ -855,8 +855,8 @@ static void layerCopyValue_mloopcol(const void *source,
m2->a = m1->a;
}
else { /* Modes that support 'real' mix factor. */
- unsigned char src[4] = {m1->r, m1->g, m1->b, m1->a};
- unsigned char dst[4] = {m2->r, m2->g, m2->b, m2->a};
+ uchar src[4] = {m1->r, m1->g, m1->b, m1->a};
+ uchar dst[4] = {m2->r, m2->g, m2->b, m2->a};
if (mixmode == CDT_MIX_MIX) {
blend_color_mix_byte(tmp_col, dst, src);