[Bf-blender-cvs] [6d2da3950e9] blender2.8: cleanup: Collada replaced outdated usage of CD_MTFACE Layers by CD_MLOOPUV

[Gaia Clary]

Commit: 6d2da3950e9df9b613c4f57ad5141fdfcbd84686
Author: Gaia Clary
Date:   Wed Nov 28 18:13:58 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB6d2da3950e9df9b613c4f57ad5141fdfcbd84686

cleanup: Collada replaced outdated usage of CD_MTFACE Layers by CD_MLOOPUV

===================================================================

M	source/blender/collada/EffectExporter.cpp
M	source/blender/collada/GeometryExporter.cpp
M	source/blender/collada/collada_utils.cpp

===================================================================

diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp
index 5c702304e27..f16392cdc1c 100644
--- a/source/blender/collada/EffectExporter.cpp
+++ b/source/blender/collada/EffectExporter.cpp
@@ -53,9 +53,9 @@ static std::string getActiveUVLayerName(Object *ob)
 {
 	Mesh *me = (Mesh *)ob->data;
 
-	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)
-		return std::string(bc_CustomData_get_active_layer_name(&me->fdata, CD_MTFACE));
+		return std::string(bc_CustomData_get_active_layer_name(&me->ldata, CD_MLOOPUV));
 
 	return "";
 }
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
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<std::vector<double>> &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);
 		}