Revision: 37977
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37977
Author: psy-fi
Date: 2011-06-30 03:46:37 +0000 (Thu, 30 Jun 2011)
Log Message:
-----------
minor code cleanup
Modified Paths:
--------------
branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c
Modified: branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c
2011-06-30 03:35:53 UTC (rev 37976)
+++ branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_ops.c
2011-06-30 03:46:37 UTC (rev 37977)
@@ -1227,6 +1227,20 @@
}
}
+static void stitch_update_face_preview_index(EditFace *efa, StitchPreviewer
*preview)
+{
+ if(efa->tmp.l == -1)
+ {
+ if(efa->v4)
+ {
+ efa->tmp.l = preview->numOfQuads*8;
+ preview->numOfQuads++;
+ } else {
+ efa->tmp.l = preview->numOfTris*6;
+ preview->numOfTris++;
+ }
+ }
+}
/* This function prepares the data of the previewer for display */
static int stitch_process_data(StitchState *state, int final, Scene *scene,
int doIndexInit)
@@ -1348,18 +1362,7 @@
if(element->flag &
STITCH_STITCHABLE)
{
/* add original
face to preview */
-
if(editFace->tmp.l == -1)
- {
-
if(editFace->v4)
- {
-
editFace->tmp.l = preview->numOfQuads*8;
-
preview->numOfQuads++;
- }
- else {
-
editFace->tmp.l = preview->numOfTris*6;
-
preview->numOfTris++;
- }
- }
+
stitch_update_face_preview_index(editFace, preview);
for(iter2 = 0;
iter2 < iter; iter2++)
{
int
averageIndex2;
@@ -1375,17 +1378,7 @@
uv_average[averageIndex2].uv[0] += uv_average[averageIndex].uv[0];
uv_average[averageIndex2].uv[1] += uv_average[averageIndex].uv[1];
-
if(efa->tmp.l == -1)
- {
-
if(efa->v4)
-
{
-
efa->tmp.l = preview->numOfQuads*8;
-
preview->numOfQuads++;
-
} else {
-
efa->tmp.l = preview->numOfTris*6;
-
preview->numOfTris++;
-
}
- }
+
stitch_update_face_preview_index(efa, preview);
}
}
}
@@ -1533,6 +1526,7 @@
* outlined above. */
el_iter2->flag |= STITCH_EDGE_PREVIEW;
}
+
preview->numOfOrig++;
}
}
}
@@ -1541,14 +1535,6 @@
UvElement
*tmp_iter;
int index_tmp;
-
//uv_average[index1].count += uv_average_tmp[0].count;
-
//uv_average[index1].uv[0] += uv_average_tmp[0].uv[0];
-
//uv_average[index1].uv[1] += uv_average_tmp[0].uv[1];
-
-
//uv_average[index2].count += uv_average_tmp[1].count;
-
//uv_average[index2].uv[0] += uv_average_tmp[1].uv[0];
-
//uv_average[index2].uv[1] += uv_average_tmp[1].uv[1];
-
/* update
coincident uv's with initial */
for(tmp_iter =
el_sep1; tmp_iter; tmp_iter = tmp_iter->next){
if(tmp_iter->separate && tmp_iter != el_sep1)
@@ -1560,17 +1546,7 @@
uv_average[index_tmp].uv[0] += uv_average_tmp[0].uv[0];
uv_average[index_tmp].uv[1] += uv_average_tmp[0].uv[1];
-
if(efa->tmp.l == -1)
- {
-
if(efa->v4)
-
{
-
efa->tmp.l = preview->numOfQuads*8;
-
preview->numOfQuads++;
-
} else {
-
efa->tmp.l = preview->numOfTris*6;
-
preview->numOfTris++;
-
}
- }
+
stitch_update_face_preview_index(efa, preview);
}
for(tmp_iter =
el_sep2; tmp_iter; tmp_iter = tmp_iter->next){
if(tmp_iter->separate && tmp_iter != el_sep2)
@@ -1582,17 +1558,7 @@
uv_average[index_tmp].uv[0] += uv_average_tmp[1].uv[0];
uv_average[index_tmp].uv[1] += uv_average_tmp[1].uv[1];
-
if(efa->tmp.l == -1)
- {
-
if(efa->v4)
-
{
-
efa->tmp.l = preview->numOfQuads*8;
-
preview->numOfQuads++;
-
} else {
-
efa->tmp.l = preview->numOfTris*6;
-
preview->numOfTris++;
-
}
- }
+
stitch_update_face_preview_index(efa, preview);
}
for(stack_iter
= 0; stack_iter < stackSize1; stack_iter++){
@@ -1605,20 +1571,7 @@
uv_average[index1].uv[0] += uv_average_tmp[0].uv[0];
uv_average[index1].uv[1] += uv_average_tmp[0].uv[1];
-
-
preview->numOfOrig++;
-
-
if(efa->tmp.l == -1)
- {
-
if(efa->v4)
-
{
-
efa->tmp.l = preview->numOfQuads*8;
-
preview->numOfQuads++;
-
} else {
-
efa->tmp.l = preview->numOfTris*6;
-
preview->numOfTris++;
-
}
- }
+
stitch_update_face_preview_index(efa, preview);
}
for(stack_iter
= 0; stack_iter < stackSize2; stack_iter++){
index2
= commonVertMaps2[stack_iter] - vmap->buf;
@@ -1630,17 +1583,7 @@
uv_average[index2].uv[0] += uv_average_tmp[1].uv[0];
uv_average[index2].uv[1] += uv_average_tmp[1].uv[1];
-
if(efa->tmp.l == -1)
- {
-
if(efa->v4)
-
{
-
efa->tmp.l = preview->numOfQuads*8;
-
preview->numOfQuads++;
-
} else {
-
efa->tmp.l = preview->numOfTris*6;
-
preview->numOfTris++;
-
}
- }
+
stitch_update_face_preview_index(efa, preview);
}
}
MEM_freeN(commonVertMaps2);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
