[Bf-blender-cvs] [89f6987] blender-v2.77-release: Fix UV-Editor crashes w/ over SHRT_MAX UV's

Campbell Barton noreply at git.blender.org
Tue Apr 5 12:45:07 CEST 2016


Commit: 89f6987953ebad852942e719a41ace3b217ec59a
Author: Campbell Barton
Date:   Tue Apr 5 20:42:21 2016 +1000
Branches: blender-v2.77-release
https://developer.blender.org/rB89f6987953ebad852942e719a41ace3b217ec59a

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 c8a1700..936858f 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 {




More information about the Bf-blender-cvs mailing list