diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2021-10-20 02:45:59 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-10-20 03:16:43 +0300 |
| commit | b280699078eee23bd8eb572668d6f0d8972d879a (patch) | |
| tree | 8b6b8461938e71914d28e707137a8960f8a2d03c /source/blender/io | |
| parent | ef9269bd62f31e39d39cc59cd34354b53eae6661 (diff) | |
Cleanup: use elem macros
Diffstat (limited to 'source/blender/io')
| -rw-r--r-- | source/blender/io/avi/intern/avi.c | 2 | ||||
| -rw-r--r-- | source/blender/io/usd/intern/usd_reader_material.cc | 2 | ||||
| -rw-r--r-- | source/blender/io/usd/intern/usd_reader_mesh.cc | 14 |
3 files changed, 10 insertions, 8 deletions
diff --git a/source/blender/io/avi/intern/avi.c b/source/blender/io/avi/intern/avi.c index 88f2e1a259f..87058693378 100644 --- a/source/blender/io/avi/intern/avi.c +++ b/source/blender/io/avi/intern/avi.c @@ -145,7 +145,7 @@ static bool fcc_is_data(int fcc) fccs[2] = fcc >> 16; fccs[3] = fcc >> 24; - if (!isdigit(fccs[0]) || !isdigit(fccs[1]) || (fccs[2] != 'd' && fccs[2] != 'w')) { + if (!isdigit(fccs[0]) || !isdigit(fccs[1]) || (!ELEM(fccs[2], 'd', 'w'))) { return 0; } if (!ELEM(fccs[3], 'b', 'c')) { diff --git a/source/blender/io/usd/intern/usd_reader_material.cc b/source/blender/io/usd/intern/usd_reader_material.cc index 93e433e231c..317dfd2a62b 100644 --- a/source/blender/io/usd/intern/usd_reader_material.cc +++ b/source/blender/io/usd/intern/usd_reader_material.cc @@ -648,7 +648,7 @@ void USDMaterialReader::load_tex_image(const pxr::UsdShadeShader &usd_shader, color_space = file_input.GetAttr().GetColorSpace(); } - if (color_space == usdtokens::RAW || color_space == usdtokens::raw) { + if (ELEM(color_space, usdtokens::RAW, usdtokens::raw)) { STRNCPY(image->colorspace_settings.name, "Raw"); } } diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc index 9c75bc8afae..5c8bd88e87a 100644 --- a/source/blender/io/usd/intern/usd_reader_mesh.cc +++ b/source/blender/io/usd/intern/usd_reader_mesh.cc @@ -390,8 +390,9 @@ void USDMeshReader::read_uvs(Mesh *mesh, const double motionSampleTime, const bo const UVSample &sample = uv_primvars[layer_idx]; - if (!(sample.interpolation == pxr::UsdGeomTokens->faceVarying || - sample.interpolation == pxr::UsdGeomTokens->vertex)) { + if (!(ELEM(sample.interpolation, + pxr::UsdGeomTokens->faceVarying, + pxr::UsdGeomTokens->vertex))) { std::cerr << "WARNING: unexpected interpolation type " << sample.interpolation << " for uv " << layer->name << std::endl; continue; @@ -781,9 +782,10 @@ Mesh *USDMeshReader::read_mesh(Mesh *existing_mesh, bool is_uv = false; /* Assume all UVs are stored in one of these primvar types */ - if (type == pxr::SdfValueTypeNames->TexCoord2hArray || - type == pxr::SdfValueTypeNames->TexCoord2fArray || - type == pxr::SdfValueTypeNames->TexCoord2dArray) { + if (ELEM(type, + pxr::SdfValueTypeNames->TexCoord2hArray, + pxr::SdfValueTypeNames->TexCoord2fArray, + pxr::SdfValueTypeNames->TexCoord2dArray)) { is_uv = true; } /* In some cases, the st primvar is stored as float2 values. */ @@ -795,7 +797,7 @@ Mesh *USDMeshReader::read_mesh(Mesh *existing_mesh, pxr::TfToken interp = p.GetInterpolation(); - if (!(interp == pxr::UsdGeomTokens->faceVarying || interp == pxr::UsdGeomTokens->vertex)) { + if (!(ELEM(interp, pxr::UsdGeomTokens->faceVarying, pxr::UsdGeomTokens->vertex))) { continue; } |