diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-30 10:53:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-30 10:53:25 +0400 |
commit | c4fa7bf286cef44f3c6c5d93aad206869f4a1b79 (patch) | |
tree | 302aae04e99e973f99000e7ebd231804abc66c2b /source | |
parent | f708318833d736af62441105382786bab303ab14 (diff) |
make_uv_vert_map() was looping over the texture face for not reason.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 12 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_ui_api.c | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 50525c2b9cd..6f66e189dcf 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -1317,7 +1317,6 @@ UvVertMap *make_uv_vert_map(struct MFace *mface, struct MTFace *tface, unsigned UvVertMap *vmap; UvMapVert *buf; MFace *mf; - MTFace *tf; unsigned int a; int i, totuv, nverts; @@ -1325,8 +1324,7 @@ UvVertMap *make_uv_vert_map(struct MFace *mface, struct MTFace *tface, unsigned /* generate UvMapVert array */ mf= mface; - tf= tface; - for(a=0; a<totface; a++, mf++, tf++) + for(a=0; a<totface; a++, mf++) if(!selected || (!(mf->flag & ME_HIDE) && (mf->flag & ME_FACE_SEL))) totuv += (mf->v4)? 4: 3; @@ -1346,8 +1344,7 @@ UvVertMap *make_uv_vert_map(struct MFace *mface, struct MTFace *tface, unsigned } mf= mface; - tf= tface; - for(a=0; a<totface; a++, mf++, tf++) { + for(a=0; a<totface; a++, mf++) { if(!selected || (!(mf->flag & ME_HIDE) && (mf->flag & ME_FACE_SEL))) { nverts= (mf->v4)? 4: 3; @@ -1363,7 +1360,6 @@ UvVertMap *make_uv_vert_map(struct MFace *mface, struct MTFace *tface, unsigned } /* sort individual uvs for each vert */ - tf= tface; for(a=0; a<totvert; a++) { UvMapVert *newvlist= NULL, *vlist=vmap->vert[a]; UvMapVert *iterv, *v, *lastv, *next; @@ -1375,14 +1371,14 @@ UvVertMap *make_uv_vert_map(struct MFace *mface, struct MTFace *tface, unsigned v->next= newvlist; newvlist= v; - uv= (tf+v->f)->uv[v->tfindex]; + uv= tface[v->f].uv[v->tfindex]; lastv= NULL; iterv= vlist; while(iterv) { next= iterv->next; - uv2= (tf+iterv->f)->uv[iterv->tfindex]; + uv2= tface[iterv->f].uv[iterv->tfindex]; sub_v2_v2v2(uvdiff, uv2, uv); diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index 4862b5224ab..25c673a168f 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -410,7 +410,7 @@ void RNA_api_ui_layout(StructRNA *srna) RNA_def_property_flag(parm, PROP_REQUIRED); parm= RNA_def_string(func, "prop_list", "", 0, "", "Identifier of a string property in each data member, specifying which " - "of its properties should have a widget displayed in its row."); + "of its properties should have a widget displayed in its row"); RNA_def_int(func, "rows", 5, 0, INT_MAX, "", "Number of rows to display", 0, INT_MAX); RNA_def_int(func, "maxrows", 5, 0, INT_MAX, "", "Maximum number of rows to display", 0, INT_MAX); RNA_def_enum(func, "type", list_type_items, 0, "Type", "Type of list to use"); |