[Bf-blender-cvs] [214e384] master: Fix UV-Editor crashes w/ over SHRT_MAX UV's

[Campbell Barton]

Commit: 214e384fc4ac0924fcad26f5eb64fc9e4c24b8a8
Author: Campbell Barton
Date:   Tue Apr 5 20:42:21 2016 +1000
Branches: master
https://developer.blender.org/rB214e384fc4ac0924fcad26f5eb64fc9e4c24b8a8

Fix UV-Editor crashes w/ over SHRT_MAX UV's

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

M	source/blender/blenkernel/BKE_mesh_mapping.h

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

diff --git a/source/blender/blenkernel/BKE_mesh_mapping.h b/source/blender/blenkernel/BKE_mesh_mapping.h
index e4b2b8a..d7dd9ed 100644
--- a/source/blender/blenkernel/BKE_mesh_mapping.h
+++ b/source/blender/blenkernel/BKE_mesh_mapping.h
@@ -69,7 +69,7 @@ typedef struct UvElement {
 	/* general use flag */
 	unsigned char flag;
 	/* If generating element map with island sorting, this stores the island index */
-	unsigned short island;
+	unsigned int island;
 } UvElement;
 
 
@@ -90,9 +90,7 @@ typedef struct UvElementMap {
 	int *islandIndices;
 } UvElementMap;
 
-/* invalid island index is max short. If any one has the patience
- * to make that many islands, he can bite me :p */
-#define INVALID_ISLAND 0xFFFF
+#define INVALID_ISLAND ((unsigned int)-1)
 
 /* Connectivity data */
 typedef struct MeshElemMap {