diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-10-01 16:48:41 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-10-01 16:48:41 +0400 |
| commit | ffec71db8490cfc5789781de8da87229b130b260 (patch) | |
| tree | 057d2c391c635c56109dbce40dbb1e7f64328517 /source/blender/blenkernel/intern/mesh.c | |
| parent | 6c83806a00cf1bf518196c9f35a2acc6535813e1 (diff) | |
Fix issues reported by coverity scan in recent changes to customdata code.
Diffstat (limited to 'source/blender/blenkernel/intern/mesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 56e6e237d57..a77f768835a 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -645,7 +645,7 @@ bool BKE_mesh_uv_cdlayer_rename_index(Mesh *me, const int poly_index, const int } cdlp = &pdata->layers[poly_index]; cdlu = &ldata->layers[loop_index]; - cdlf = do_tessface ? &fdata->layers[face_index] : NULL; + cdlf = fdata && do_tessface ? &fdata->layers[face_index] : NULL; BLI_strncpy(cdlp->name, new_name, sizeof(cdlp->name)); CustomData_set_layer_unique_name(pdata, cdlp - pdata->layers); @@ -662,8 +662,10 @@ bool BKE_mesh_uv_cdlayer_rename_index(Mesh *me, const int poly_index, const int CustomData_set_layer_unique_name(ldata, cdlu - ldata->layers); break; case 2: - BLI_strncpy(cdlf->name, cdlp->name, sizeof(cdlf->name)); - CustomData_set_layer_unique_name(fdata, cdlf - fdata->layers); + if (cdlf) { + BLI_strncpy(cdlf->name, cdlp->name, sizeof(cdlf->name)); + CustomData_set_layer_unique_name(fdata, cdlf - fdata->layers); + } break; } } |