[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60859] branches/vgroup_modifiers: svn merge -r 60855:60858 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

[Bastien Montagne]

Revision: 60859
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60859
Author:   mont29
Date:     2013-10-19 14:04:06 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
svn merge -r 60855:60858 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh_evaluate.c
    branches/vgroup_modifiers/source/blender/editors/animation/anim_markers.c

Property Changed:
----------------
    branches/vgroup_modifiers/


Property changes on: branches/vgroup_modifiers
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,59942,60073,60094,60096,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-60855
   + /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,59942,60073,60094,60096,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-60858

Modified: branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh_evaluate.c
===================================================================
--- branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh_evaluate.c	2013-10-19 13:48:51 UTC (rev 60858)
+++ branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh_evaluate.c	2013-10-19 14:04:06 UTC (rev 60859)
@@ -380,7 +380,8 @@
 			if ((e2l[0] | e2l[1]) == 0) {
 				/* 'Empty' edge until now, set e2l[0] (and e2l[1] to INDEX_UNSET to tag it as unset). */
 				e2l[0] = ml_curr_index;
-				e2l[1] = INDEX_UNSET;
+				/* We have to check this here too, else we might miss some flat faces!!! */
+				e2l[1] = (mp->flag & ME_SMOOTH) ? INDEX_UNSET : INDEX_INVALID;
 			}
 			else if (e2l[1] == INDEX_UNSET) {
 				/* Second loop using this edge, time to test its sharpness.

Modified: branches/vgroup_modifiers/source/blender/editors/animation/anim_markers.c
===================================================================
--- branches/vgroup_modifiers/source/blender/editors/animation/anim_markers.c	2013-10-19 13:48:51 UTC (rev 60858)
+++ branches/vgroup_modifiers/source/blender/editors/animation/anim_markers.c	2013-10-19 14:04:06 UTC (rev 60859)
@@ -211,8 +211,9 @@
 		TimeMarker *fm = markers->first;
 		TimeMarker *lm = markers->last;
 		
-		min = (float)fm->frame;
-		max = (float)lm->frame;
+		/* Store last marker in min, and first marker in max, so that later real value calc actually works! [#37146]. */
+		min = (float)lm->frame;
+		max = (float)fm->frame;
 	}
 	else {
 		*first = 0.0f;