diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-01-01 17:02:26 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-01-01 17:02:26 +0300 |
| commit | e59cf13b8c457c69945a9f85e9de61d36d434eea (patch) | |
| tree | 6b54fbb2a9527d3b985d2b23a19d8ea34bda720b /source/blender/collada/collada_utils.cpp | |
| parent | ac934efc5e0c6889012d228fb466d4739d2ebb5c (diff) | |
fix T53230: avoid Nullpointer problems in Collada Exporter
Diffstat (limited to 'source/blender/collada/collada_utils.cpp')
| -rw-r--r-- | source/blender/collada/collada_utils.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
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 ""; } |