diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-12-14 02:41:39 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-12-14 02:59:41 +0300 |
| commit | 1f953478828a9bfd1faf78df68e5abb1680858c5 (patch) | |
| tree | aafdecd20b32a6143003f88d20ad60f7516aa7ea /source/blender/collada/GeometryExporter.cpp | |
| parent | a6218502240499423d29157d3ca3dcb916909b64 (diff) | |
Fix T53322: Collada export crash w/ shape keys
D2958 by @cmbasnett
Diffstat (limited to 'source/blender/collada/GeometryExporter.cpp')
| -rw-r--r-- | source/blender/collada/GeometryExporter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp index 8a9ccbbed51..73b00fd07ec 100644 --- a/source/blender/collada/GeometryExporter.cpp +++ b/source/blender/collada/GeometryExporter.cpp @@ -548,7 +548,7 @@ void GeometryExporter::createPolylist(std::string imageid, MTexPoly *tp = &mtpolys[i]; MPoly *p = &mpolys[i]; - std::string tpageid = (tp->tpage) ? id_name(tp->tpage):""; + std::string tpageid = (mtpolys && tp->tpage) ? id_name(tp->tpage) : ""; if (tpageid == imageid) { faces_in_polylist++; vcount_list.push_back(p->totloop); @@ -637,7 +637,7 @@ void GeometryExporter::createPolylist(std::string imageid, MTexPoly *tp = &mtpolys[i]; MPoly *p = &mpolys[i]; int loop_count = p->totloop; - std::string tpageid = (tp->tpage) ? id_name(tp->tpage) : ""; + std::string tpageid = (mtpolys && tp->tpage) ? id_name(tp->tpage) : ""; if (tpageid == imageid) { MLoop *l = &mloops[p->loopstart]; BCPolygonNormalsIndices normal_indices = norind[i]; |