Freestyle: Fix for destructive view map modifications during chaining operations.

The view map is mostly treated as a read-only data structure by line stylization
operations (i.e., selection, chaining, splitting, sorting and stroke creation).  The
only exception is the chaining operation in some cases where insertion of extra
FEdge objects is necessary to ensure the continuity of underlying FEdges from
which a chain is constructed.

The present revision addresses the removal of extra FEdges so to keep the view
map clean and suitable for reuse in subsequent render frames.

1 files changed, 9 insertions, 4 deletions

diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index a7f936ff171..29fed062cdf 100644
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -423,10 +423,15 @@ void Controller::DeleteViewMap(bool freeCache)
 			_DebugNode->addRef();
 	}
 
-	if ((freeCache || !_EnableViewMapCache) && NULL != _ViewMap) {
-		delete _ViewMap;
-		_ViewMap = NULL;
-		prevSceneHash = -1.0;
+	if (NULL != _ViewMap) {
+		if (freeCache || !_EnableViewMapCache) {
+			delete _ViewMap;
+			_ViewMap = NULL;
+			prevSceneHash = -1.0;
+		}
+		else {
+			_ViewMap->Clean();
+		}
 	}
 }