From 6d2da3950e9df9b613c4f57ad5141fdfcbd84686 Mon Sep 17 00:00:00 2001 From: Gaia Clary Date: Wed, 28 Nov 2018 18:13:58 +0100 Subject: cleanup: Collada replaced outdated usage of CD_MTFACE Layers by CD_MLOOPUV --- source/blender/collada/collada_utils.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/collada/collada_utils.cpp') diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index 3a0fb9fd64f..f5be93195ab 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -443,7 +443,7 @@ bool bc_is_root_bone(Bone *aBone, bool deform_bones_only) int bc_get_active_UVLayer(Object *ob) { Mesh *me = (Mesh *)ob->data; - return CustomData_get_active_layer_index(&me->fdata, CD_MTFACE); + return CustomData_get_active_layer_index(&me->ldata, CD_MLOOPUV); } std::string bc_url_encode(std::string data) @@ -1202,9 +1202,9 @@ void bc_copy_m4d_v44(double (&r)[4][4], std::vector> &a) */ std::string bc_get_active_uvlayer_name(Mesh *me) { - int num_layers = CustomData_number_of_layers(&me->fdata, CD_MTFACE); + int num_layers = CustomData_number_of_layers(&me->ldata, CD_MLOOPUV); if (num_layers) { - char *layer_name = bc_CustomData_get_active_layer_name(&me->fdata, CD_MTFACE); + char *layer_name = bc_CustomData_get_active_layer_name(&me->ldata, CD_MLOOPUV); if (layer_name) { return std::string(layer_name); } @@ -1227,9 +1227,9 @@ std::string bc_get_active_uvlayer_name(Object *ob) */ std::string bc_get_uvlayer_name(Mesh *me, int layer) { - int num_layers = CustomData_number_of_layers(&me->fdata, CD_MTFACE); + int num_layers = CustomData_number_of_layers(&me->ldata, CD_MLOOPUV); if (num_layers && layer < num_layers) { - char *layer_name = bc_CustomData_get_layer_name(&me->fdata, CD_MTFACE, layer); + char *layer_name = bc_CustomData_get_layer_name(&me->ldata, CD_MLOOPUV, layer); if (layer_name) { return std::string(layer_name); } -- cgit v1.2.3