svn merge ^/trunk/blender -c56826 -c56836 -c56839

3 files changed, 14 insertions, 4 deletions

diff --git a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
index 2215bd9df02..d30a75d9e14 100644
--- a/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
+++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
@@ -158,6 +158,8 @@ int SpatialNoiseShader::shade(Stroke &ioStroke) const
 		++v;
 	}
 
+	ioStroke.UpdateLength();
+
 	return 0;
 }
 
@@ -342,6 +344,7 @@ void Smoother::copyVertices()
 		(v)->setPoint(p[0], p[1]);
 		++i;
 	}
+	_stroke->UpdateLength();
 }
 
 #if 0 // FIXME
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 984420d313f..725ac2307fa 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -3268,10 +3268,12 @@ static EdgeHash *make_freestyle_edge_mark_hash(Mesh *me, DerivedMesh *dm)
 	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 {
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index e2d6633fffc..15b81893813 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -424,6 +424,11 @@ void RE_FreeAllRender(void)
 	while (RenderGlobal.renderlist.first) {
 		RE_FreeRender(RenderGlobal.renderlist.first);
 	}
+
+#ifdef WITH_FREESTYLE
+	/* finalize Freestyle */
+	FRS_exit();
+#endif
 }
 
 /* on file load, free all re */