[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56853] tags/blender-2.67a-release/blender : svn merge ^/trunk/blender -c56826 -c56836 -c56839

[Campbell Barton]

Revision: 56853
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56853
Author:   campbellbarton
Date:     2013-05-16 12:16:20 +0000 (Thu, 16 May 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c56826 -c56836 -c56839

Modified Paths:
--------------
    tags/blender-2.67a-release/blender/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
    tags/blender-2.67a-release/blender/source/blender/render/intern/source/convertblender.c
    tags/blender-2.67a-release/blender/source/blender/render/intern/source/pipeline.c

Property Changed:
----------------
    tags/blender-2.67a-release/blender/


Property changes on: tags/blender-2.67a-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /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
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606,56620,56639,56643,56647-56648,56650-56651,56653-56654,56661-56663,56668,56670-56674,56676,56678-56680,56682,56688-56689,56698,56700,56707,56711,56735,56745,56747-56749,56755-56756,56759-56760,56763,56766-56767,56773,56778,56783-56785,56790-56791,56793,56800,56806-56807,56809,56815-56816,56820
   + /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
/trunk/blender:56529-56532,56534,56537-56539,56572,56577,56581,56601,56605-56606,56620,56639,56643,56647-56648,56650-56651,56653-56654,56661-56663,56668,56670-56674,56676,56678-56680,56682,56688-56689,56698,56700,56707,56711,56735,56745,56747-56749,56755-56756,56759-56760,56763,56766-56767,56773,56778,56783-56785,56790-56791,56793,56800,56806-56807,56809,56815-56816,56820,56826,56836,56839

Modified: tags/blender-2.67a-release/blender/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp	2013-05-16 12:11:46 UTC (rev 56852)
+++ tags/blender-2.67a-release/blender/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp	2013-05-16 12:16:20 UTC (rev 56853)
@@ -158,6 +158,8 @@
 		++v;
 	}
 
+	ioStroke.UpdateLength();
+
 	return 0;
 }
 
@@ -342,6 +344,7 @@
 		(v)->setPoint(p[0], p[1]);
 		++i;
 	}
+	_stroke->UpdateLength();
 }
 
 #if 0 // FIXME

Modified: tags/blender-2.67a-release/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/render/intern/source/convertblender.c	2013-05-16 12:11:46 UTC (rev 56852)
+++ tags/blender-2.67a-release/blender/source/blender/render/intern/source/convertblender.c	2013-05-16 12:16:20 UTC (rev 56853)
@@ -3268,10 +3268,12 @@
 	if (fed) {
 		edge_hash = BLI_edgehash_new();
 		if (!index) {
-			BLI_assert(me->totedge == totedge);
-			for (a = 0; a < me->totedge; a++) {
-				if (fed[a].flag & FREESTYLE_EDGE_MARK)
-					BLI_edgehash_insert(edge_hash, medge[a].v1, medge[a].v2, medge+a);
+			if (me->totedge == totedge) {
+				for (a = 0; a < me->totedge; a++) {
+					if (fed[a].flag & FREESTYLE_EDGE_MARK) {
+						BLI_edgehash_insert(edge_hash, medge[a].v1, medge[a].v2, medge + a);
+					}
+				}
 			}
 		}
 		else {

Modified: tags/blender-2.67a-release/blender/source/blender/render/intern/source/pipeline.c
===================================================================
--- tags/blender-2.67a-release/blender/source/blender/render/intern/source/pipeline.c	2013-05-16 12:11:46 UTC (rev 56852)
+++ tags/blender-2.67a-release/blender/source/blender/render/intern/source/pipeline.c	2013-05-16 12:16:20 UTC (rev 56853)
@@ -424,6 +424,11 @@
 	while (RenderGlobal.renderlist.first) {
 		RE_FreeRender(RenderGlobal.renderlist.first);
 	}
+
+#ifdef WITH_FREESTYLE
+	/* finalize Freestyle */
+	FRS_exit();
+#endif
 }
 
 /* on file load, free all re */