improved Freestyle IO formatting

3 files changed, 8 insertions, 1 deletions

diff --git a/source/blender/freestyle/intern/stroke/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/BlenderStrokeRenderer.cpp
index 59f54ce3881..a175620c8d7 100644
--- a/source/blender/freestyle/intern/stroke/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/stroke/BlenderStrokeRenderer.cpp
@@ -56,7 +56,7 @@ BlenderStrokeRenderer::BlenderStrokeRenderer()
 	lb = scene->r.layers;
 	scene->r= old_scene->r;
 	scene->r.layers= lb;
-	set_scene( scene ); // scene.makeCurrent()
+	set_scene( scene );
 
 	// image dimensions
 	float width = scene->r.xsch;
diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp
index 84411c20970..01f5b9b6fb1 100755
--- a/source/blender/freestyle/intern/stroke/Canvas.cpp
+++ b/source/blender/freestyle/intern/stroke/Canvas.cpp
@@ -114,6 +114,8 @@ void Canvas::Draw()
 
     _Layers[i] = _StyleModules[i]->execute();
 
+	stroke_count += _Layers[i]->strokes_size();
+
     timestamp->increment();
   }
   postDraw();
@@ -146,6 +148,8 @@ void Canvas::Clear()
   }
   if(_steerableViewMap)
     _steerableViewMap->Reset();
+
+	stroke_count = 0;
 }
 
 void Canvas::Erase()
@@ -161,6 +165,8 @@ void Canvas::Erase()
   if(_steerableViewMap)
     _steerableViewMap->Reset();
   update();
+
+stroke_count = 0;
 }
 
 void Canvas::InsertStyleModule(unsigned index, StyleModule *iStyleModule) {
diff --git a/source/blender/freestyle/intern/stroke/Canvas.h b/source/blender/freestyle/intern/stroke/Canvas.h
index 4dd13950daf..b61e70099a8 100755
--- a/source/blender/freestyle/intern/stroke/Canvas.h
+++ b/source/blender/freestyle/intern/stroke/Canvas.h
@@ -175,6 +175,7 @@ public:
   inline const StrokeRenderer * renderer() const {return _Renderer;}
   inline StyleModule* getCurrentStyleModule() { return _current_sm; }
   virtual bool getRecordFlag() const {return false;}
+	int stroke_count;
 
   /*! modifiers */
   inline void setSelectedFEdge(FEdge *iFEdge) {_SelectedFEdge = iFEdge;}