[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45748] branches/soc-2011-tomato: Merging r45744 through r45747 from trunk into soc-2011-tomato

[Sergey Sharybin]

Revision: 45748
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45748
Author:   nazgul
Date:     2012-04-18 14:22:32 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
Merging r45744 through r45747 from trunk into soc-2011-tomato

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45744
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45747

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-45743
   + /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-45747

Modified: branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c	2012-04-18 14:06:59 UTC (rev 45747)
+++ branches/soc-2011-tomato/source/blender/blenlib/intern/scanfill.c	2012-04-18 14:22:32 UTC (rev 45748)
@@ -581,12 +581,12 @@
 		 * fix to #4544. */
 		if (eed->v1->f == 255) {
 			v1 = eed->v1;
-			while ((eed->v1->f == 255) && (eed->v1->tmp.v != v1)) 
+			while ((eed->v1->f == 255) && (eed->v1->tmp.v != v1) && (eed->v1 != eed->v1->tmp.v))
 				eed->v1 = eed->v1->tmp.v;
 		}
 		if (eed->v2->f == 255) {
 			v2 = eed->v2;
-			while ((eed->v2->f == 255) && (eed->v2->tmp.v != v2))
+			while ((eed->v2->f == 255) && (eed->v2->tmp.v != v2) && (eed->v2 != eed->v2->tmp.v))
 				eed->v2 = eed->v2->tmp.v;
 		}
 		if (eed->v1 != eed->v2) addedgetoscanlist(sf_ctx, eed, verts);
@@ -876,8 +876,8 @@
 			for (eve = sf_ctx->fillvertbase.first; eve; eve = eve->next) {
 				if (LIKELY(!compare_v3v3(v_prev, eve->co, COMPLIMIT))) {
 					add_newell_cross_v3_v3v3(n, v_prev, eve->co);
+					v_prev = eve->co;
 				}
-				v_prev = eve->co;
 			}
 		}
 


Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-45743
   + /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-45747