diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-02-27 11:31:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-27 11:31:10 +0300 |
commit | 2e5eb4152262adfc382860073dc5e73ced187e35 (patch) | |
tree | 3589c86b41a503b729c5a82462ad599a14fed4f3 /source/blender/editors/uvedit | |
parent | f73c993b16c4083f0c72b87ba3f70fa12a5077df (diff) |
pedantic warning cleanup, also remove texspace_edit() since its been added using a different method.
Diffstat (limited to 'source/blender/editors/uvedit')
-rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 5 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_parametrizer.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index e916170a5fa..d110dbfb1ad 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -835,7 +835,8 @@ static void select_linked(Scene *scene, Image *ima, EditMesh *em, float limit[2] MTFace *tf; UvVertMap *vmap; UvMapVert *vlist, *iterv, *startv; - int a, i, nverts, stacksize= 0, *stack; + int i, nverts, stacksize= 0, *stack; + unsigned int a; char *flag; EM_init_index_arrays(em, 0, 0, 1); /* we can use this too */ @@ -2022,7 +2023,7 @@ static void uv_faces_do_sticky(bContext *C, SpaceImage *sima, Scene *scene, Obje UvMapVert *start_vlist=NULL, *vlist_iter; struct UvVertMap *vmap; float limit[2]; - int efa_index; + unsigned int efa_index; //EditVert *eve; /* removed vert counting for now */ //int a; diff --git a/source/blender/editors/uvedit/uvedit_parametrizer.c b/source/blender/editors/uvedit/uvedit_parametrizer.c index 981332c8fbf..1811819dda2 100644 --- a/source/blender/editors/uvedit/uvedit_parametrizer.c +++ b/source/blender/editors/uvedit/uvedit_parametrizer.c @@ -260,7 +260,7 @@ static int phash_size(PHash *ph) static void phash_insert(PHash *ph, PHashLink *link) { int size = ph->cursize; - int hash = PHASH_hash(ph, link->key); + uintptr_t hash = PHASH_hash(ph, link->key); PHashLink *lookup = ph->buckets[hash]; if (lookup == NULL) { @@ -296,7 +296,7 @@ static void phash_insert(PHash *ph, PHashLink *link) static PHashLink *phash_lookup(PHash *ph, PHashKey key) { PHashLink *link; - int hash = PHASH_hash(ph, key); + uintptr_t hash = PHASH_hash(ph, key); for (link = ph->buckets[hash]; link; link = link->next) if (link->key == key) @@ -309,7 +309,7 @@ static PHashLink *phash_lookup(PHash *ph, PHashKey key) static PHashLink *phash_next(PHash *ph, PHashKey key, PHashLink *link) { - int hash = PHASH_hash(ph, key); + uintptr_t hash = PHASH_hash(ph, key); for (link = link->next; link; link = link->next) if (link->key == key) |