blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

fix T53230: avoid Nullpointer problems in Collada Exporter

This commit is contained in:
Gaia Clary 2018-01-01 15:02:26 +01:00
parent ac934efc5e
commit e59cf13b8c
Notes: blender-bot 2023-02-14 06:27:48 +01:00 
Referenced by issue #53680, Up and Down keyboards arrows bug with Replace exisiting pose (PoseLib)
Referenced by issue #53681, Rotate Along Axis Not on correct value
Referenced by issue #53683, 2.79a release
Referenced by issue #53230, import a fbx then export a dae file, blender crashed, (always)
Referenced by issue #53080, Blender freezes temporarily when editing material color and/or changing number values in sliders
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/collada/collada_utils.cpp
View File

@ -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 "";
}

1
source/blender/collada/collada_utils.h
View File

@ -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);