archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T53322: Collada export crash w/ shape keys

Browse Source 
D2958 by @cmbasnett
This commit is contained in:
Campbell Barton
2017-12-14 10:41:39 +11:00
parent a621850224
commit 1f95347882
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/collada/GeometryExporter.cpp
View File

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