diff options
| author | Antonio Vazquez <blendergit@gmail.com> | 2022-04-25 11:11:55 +0300 |
|---|---|---|
| committer | Antonio Vazquez <blendergit@gmail.com> | 2022-04-25 11:11:55 +0300 |
| commit | d3b5ab37772aafd6892466a61eb75741f70189de (patch) | |
| tree | fd5a4c1b0a76313ddee5b2a1fa93a7b6f618cd85 /source/blender/io/usd/intern/usd_reader_mesh.cc | |
| parent | 99dfc769f32a53c118692451d38d534bed697e88 (diff) | |
| parent | 416ef3b6b2d21a2eb7a24183ab67c8a540f79d57 (diff) | |
Merge branch 'master' into temp-gp-overlay-refactortemp-gp-overlay-refactor
Diffstat (limited to 'source/blender/io/usd/intern/usd_reader_mesh.cc')
| -rw-r--r-- | source/blender/io/usd/intern/usd_reader_mesh.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc index 646d1ba1fde..328b4109616 100644 --- a/source/blender/io/usd/intern/usd_reader_mesh.cc +++ b/source/blender/io/usd/intern/usd_reader_mesh.cc @@ -149,7 +149,7 @@ static void *add_customdata_cb(Mesh *mesh, const char *name, const int data_type int numloops; /* unsupported custom data type -- don't do anything. */ - if (!ELEM(cd_data_type, CD_MLOOPUV, CD_MLOOPCOL)) { + if (!ELEM(cd_data_type, CD_MLOOPUV, CD_PROP_BYTE_COLOR)) { return nullptr; } @@ -457,7 +457,7 @@ void USDMeshReader::read_colors(Mesh *mesh, const double motionSampleTime) return; } - void *cd_ptr = add_customdata_cb(mesh, "displayColors", CD_MLOOPCOL); + void *cd_ptr = add_customdata_cb(mesh, "displayColors", CD_PROP_BYTE_COLOR); if (!cd_ptr) { std::cerr << "WARNING: Couldn't add displayColors custom data.\n"; |