diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-11-28 20:13:58 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-11-28 20:14:12 +0300 |
| commit | 6d2da3950e9df9b613c4f57ad5141fdfcbd84686 (patch) | |
| tree | 1f3df54ba5d11d6b244b7bee0f80f36d959ac112 /source/blender/collada/GeometryExporter.cpp | |
| parent | 91795e756c1492d5f7d1fb7414a545c2eb097b08 (diff) | |
cleanup: Collada replaced outdated usage of CD_MTFACE Layers by CD_MLOOPUV
Diffstat (limited to 'source/blender/collada/GeometryExporter.cpp')
| -rw-r--r-- | source/blender/collada/GeometryExporter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index 8b4302f3470..a82d07d53dd 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -101,7 +101,7 @@ void GeometryExporter::operator()(Object *ob) // writes <source> for normal coords createNormalsSource(geom_id, me, nor); - bool has_uvs = (bool)CustomData_has_layer(&me->fdata, CD_MTFACE); + bool has_uvs = (bool)CustomData_has_layer(&me->ldata, CD_MLOOPUV); // writes <source> for uv coords if mesh has uv coords if (has_uvs) { @@ -187,7 +187,7 @@ void GeometryExporter::export_key_mesh(Object *ob, Mesh *me, KeyBlock *kb) // writes <source> for normal coords createNormalsSource(geom_id, me, nor); - bool has_uvs = (bool)CustomData_has_layer(&me->fdata, CD_MTFACE); + bool has_uvs = (bool)CustomData_has_layer(&me->ldata, CD_MLOOPUV); // writes <source> for uv coords if mesh has uv coords if (has_uvs) { @@ -346,12 +346,12 @@ void GeometryExporter::createPolylist(short material_index, til.push_back(input2); // if mesh has uv coords writes <input> for TEXCOORD - int num_layers = CustomData_number_of_layers(&me->fdata, CD_MTFACE); - int active_uv_index = CustomData_get_active_layer_index(&me->fdata, CD_MTFACE)-1; + int num_layers = CustomData_number_of_layers(&me->ldata, CD_MLOOPUV); + int active_uv_index = CustomData_get_active_layer_index(&me->ldata, CD_MLOOPUV); for (i = 0; i < num_layers; i++) { if (!this->export_settings->active_uv_only || i == active_uv_index) { - // char *name = CustomData_get_layer_name(&me->fdata, CD_MTFACE, i); + // char *name = CustomData_get_layer_name(&me->ldata, CD_MLOOPUV, i); COLLADASW::Input input3(COLLADASW::InputSemantic::TEXCOORD, makeUrl(makeTexcoordSourceId(geom_id, i, this->export_settings->active_uv_only)), 2, // this is only until we have optimized UV sets |