forked from bartvdbraak/blender
fix T53230: avoid Nullpointer problems in Collada Exporter
This commit is contained in:
parent
ac934efc5e
commit
e59cf13b8c
@ -852,7 +852,10 @@ 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->fdata, CD_MTFACE);
|
||||||
if (num_layers) {
|
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 "";
|
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);
|
int num_layers = CustomData_number_of_layers(&me->fdata, CD_MTFACE);
|
||||||
if (num_layers && layer < num_layers) {
|
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 "";
|
return "";
|
||||||
}
|
}
|
||||||
|
@ -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_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_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 void bc_bubble_sort_by_Object_name(LinkNode *export_set);
|
||||||
extern bool bc_is_root_bone(Bone *aBone, bool deform_bones_only);
|
extern bool bc_is_root_bone(Bone *aBone, bool deform_bones_only);
|
||||||
|
Loading…
Reference in New Issue
Block a user