[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58041] branches/soc-2013-paint/source/ blender/editors/sculpt_paint/paint_image_proj.c: Revert yesterday's fix, it makes every face have a seam.
Antony Riakiotakis
kalast at gmail.com
Sat Jul 6 12:49:15 CEST 2013
Revision: 58041
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58041
Author: psy-fi
Date: 2013-07-06 10:49:14 +0000 (Sat, 06 Jul 2013)
Log Message:
-----------
Revert yesterday's fix, it makes every face have a seam. The solution is
to check the winding in UV space, but this requires bigger changes, also
might be better to do offline, not during stroke.
Modified Paths:
--------------
branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_proj.c
Modified: branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_proj.c
===================================================================
--- branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_proj.c 2013-07-06 08:10:41 UTC (rev 58040)
+++ branches/soc-2013-paint/source/blender/editors/sculpt_paint/paint_image_proj.c 2013-07-06 10:49:14 UTC (rev 58041)
@@ -909,8 +909,6 @@
/* Only need to check if 'i2_fidx' is valid because we know i1_fidx is the same vert on both faces */
if (i2_fidx != -1) {
- bool winding1 = orig_i1_fidx == (orig_i2_fidx + 1) % ((orig_mf->v4)? 4 : 3);
- bool winding2 = i1_fidx == (i2_fidx + 1) % ((mf->v4)? 4 : 3);
Image *tpage = project_paint_face_image(ps, ps->dm_mtface, face_index);
Image *orig_tpage = project_paint_face_image(ps, ps->dm_mtface, orig_face);
@@ -927,12 +925,10 @@
* should be opposing */
if ((orig_tpage == tpage) &&
cmp_uv(orig_tf->uv[orig_i1_fidx], tf->uv[i1_fidx]) &&
- cmp_uv(orig_tf->uv[orig_i2_fidx], tf->uv[i2_fidx]) &&
- (winding1 == winding2))
+ cmp_uv(orig_tf->uv[orig_i2_fidx], tf->uv[i2_fidx]))
{
// printf("SEAM (NONE)\n");
return 0;
-
}
else {
// printf("SEAM (UV GAP)\n");
More information about the Bf-blender-cvs
mailing list