[Bf-blender-cvs] [e59cf13b8c4] master: fix T53230: avoid Nullpointer problems in Collada Exporter

[Gaia Clary]

Commit: e59cf13b8c457c69945a9f85e9de61d36d434eea
Author: Gaia Clary
Date:   Mon Jan 1 15:02:26 2018 +0100
Branches: master
https://developer.blender.org/rBe59cf13b8c457c69945a9f85e9de61d36d434eea

fix T53230: avoid Nullpointer problems in Collada Exporter

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

M	source/blender/collada/collada_utils.cpp
M	source/blender/collada/collada_utils.h

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

diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp
index b09732f9102..37bd1a2a9c1 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -852,7 +852,10 @@ std::string bc_get_active_uvlayer_name(Mesh *me)
 {
 	int num_layers = CustomData_number_of_layers(&me->fdata, CD_MTFACE);
 	if (num_layers) {
-		return std::string(bc_CustomData_get_active_layer_name(&me->fdata, CD_MTFACE));
+		char *layer_name = bc_CustomData_get_active_layer_name(&me->fdata, CD_MTFACE);
+		if (layer_name) {
+			return std::string(layer_name);
+		}
 	}
 	return "";
 }
@@ -864,7 +867,10 @@ std::string bc_get_uvlayer_name(Mesh *me, int layer)
 {
 	int num_layers = CustomData_number_of_layers(&me->fdata, CD_MTFACE);
 	if (num_layers && layer < num_layers) {
-		return std::string(bc_CustomData_get_layer_name(&me->fdata, CD_MTFACE, layer));
+		char *layer_name = bc_CustomData_get_layer_name(&me->fdata, CD_MTFACE, layer);
+		if (layer_name) {
+			return std::string(layer_name);
+		}
 	}
 	return "";
 }
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h
index 5447c39e902..93741fb0e70 100644
--- a/source/blender/collada/collada_utils.h
+++ b/source/blender/collada/collada_utils.h
@@ -81,7 +81,6 @@ extern void bc_set_mark(Object *ob);
 
 extern char *bc_CustomData_get_layer_name(const CustomData *data, int type, int n);
 extern char *bc_CustomData_get_active_layer_name(const CustomData *data, int type);
-extern char *bc_CustomData_get_layer_name(const CustomData *data, int layer_index, int type);
 
 extern void bc_bubble_sort_by_Object_name(LinkNode *export_set);
 extern bool bc_is_root_bone(Bone *aBone, bool deform_bones_only);