[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41378] trunk/blender/source/blender: make_uv_vert_map() was looping over the texture face for not reason.
Campbell Barton
ideasman42 at gmail.com
Sun Oct 30 07:53:26 CET 2011
Revision: 41378
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41378
Author: campbellbarton
Date: 2011-10-30 06:53:25 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
make_uv_vert_map() was looping over the texture face for not reason.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2011-10-30 04:48:00 UTC (rev 41377)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2011-10-30 06:53:25 UTC (rev 41378)
@@ -1317,7 +1317,6 @@
UvVertMap *vmap;
UvMapVert *buf;
MFace *mf;
- MTFace *tf;
unsigned int a;
int i, totuv, nverts;
@@ -1325,8 +1324,7 @@
/* 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 @@
}
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 @@
}
/* 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 @@
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);
Modified: trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ui_api.c 2011-10-30 04:48:00 UTC (rev 41377)
+++ trunk/blender/source/blender/makesrna/intern/rna_ui_api.c 2011-10-30 06:53:25 UTC (rev 41378)
@@ -410,7 +410,7 @@
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");
More information about the Bf-blender-cvs
mailing list