[Bf-blender-cvs] [1f953478828] master: Fix T53322: Collada export crash w/ shape keys

[Campbell Barton]

Commit: 1f953478828a9bfd1faf78df68e5abb1680858c5
Author: Campbell Barton
Date:   Thu Dec 14 10:41:39 2017 +1100
Branches: master
https://developer.blender.org/rB1f953478828a9bfd1faf78df68e5abb1680858c5

Fix T53322: Collada export crash w/ shape keys

D2958 by @cmbasnett

===================================================================

M	source/blender/collada/GeometryExporter.cpp

===================================================================

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