Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-04-05 13:42:21 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-04-05 15:16:09 +0300
commit214e384fc4ac0924fcad26f5eb64fc9e4c24b8a8 (patch)
treebd042e8f99c272210fc6990bcdabddf183e9c743 /source/blender/blenkernel/BKE_mesh_mapping.h
parentb8ca4819b2e9288cb86988c01b0b6a2a5b39fe8a (diff)
Fix UV-Editor crashes w/ over SHRT_MAX UV's
Diffstat (limited to 'source/blender/blenkernel/BKE_mesh_mapping.h')
-rw-r--r--source/blender/blenkernel/BKE_mesh_mapping.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_mesh_mapping.h b/source/blender/blenkernel/BKE_mesh_mapping.h
index e4b2b8ae9b6..d7dd9ed3ac5 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 {