fixes for NULL checks, remove some redundant checks and add some in that have been removed by accident as code has been updated.

1 files changed, 10 insertions, 8 deletions

diff --git a/source/blender/editors/mesh/meshtools.c b/source/blender/editors/mesh/meshtools.c
index 06dcac0505a..a7467ee4c79 100644
--- a/source/blender/editors/mesh/meshtools.c
+++ b/source/blender/editors/mesh/meshtools.c
@@ -442,18 +442,20 @@ int join_mesh_exec(bContext *C, wmOperator *op)
 			}
 			
 			if (me->totpoly) {
-				/* make mapping for materials */
-				for (a = 1; a <= base->object->totcol; a++) {
-					ma = give_current_material(base->object, a);
+				if (totmat) {
+					/* make mapping for materials */
+					for (a = 1; a <= base->object->totcol; a++) {
+						ma = give_current_material(base->object, a);
 
-					for (b = 0; b < totcol; b++) {
-						if (ma == matar[b]) {
-							matmap[a - 1] = b;
-							break;
+						for (b = 0; b < totcol; b++) {
+							if (ma == matar[b]) {
+								matmap[a - 1] = b;
+								break;
+							}
 						}
 					}
 				}
-				
+
 				CustomData_merge(&me->pdata, &pdata, CD_MASK_MESH, CD_DEFAULT, totpoly);
 				CustomData_copy_data(&me->pdata, &pdata, 0, polyofs, me->totpoly);