New options for specifying unit line thickness.

The Post Processing tab in the Render buttons has new Line Thickness options for
defining unit line thickness in two different modes as follows:

1. Absolute mode: The unit line thickness is given by a user-specified number
in units of pixels.  The default value is 1.

2. Relative mode: The unit line thickness is scaled by the proportion of the
present vertical image resolution to 480 pixels.  For instance, the unit line
thickness is 1 with the image height set to 480, 1.5 with 720, and 2 with 960.

3 files changed, 16 insertions, 1 deletions

diff --git a/source/blender/freestyle/intern/application/AppCanvas.cpp b/source/blender/freestyle/intern/application/AppCanvas.cpp
index 2895549a79c..ec83d2d9ff8 100755
--- a/source/blender/freestyle/intern/application/AppCanvas.cpp
+++ b/source/blender/freestyle/intern/application/AppCanvas.cpp
@@ -26,6 +26,7 @@
 #include "../stroke/StrokeRenderer.h"
 #include "AppCanvas.h"
 #include "AppConfig.h"
+#include "../stroke/StyleModule.h"
 
 #include "../system/StringUtils.h"
 
@@ -73,6 +74,11 @@ BBox<Vec2i> AppCanvas::border() const
   return _pViewer->border();
 }
 
+float AppCanvas::thickness() const
+{
+  return _pViewer->thickness();
+}
+
 BBox<Vec3r> AppCanvas::scene3DBBox() const 
 {
   return _pViewer->scene3DBBox();
@@ -100,7 +106,12 @@ void AppCanvas::init()
 
 void AppCanvas::postDraw()
 {
-	Canvas::postDraw();
+  for (unsigned i = 0; i < _StyleModules.size(); i++) {
+    if(!_StyleModules[i]->getDisplayed() || !_Layers[i])
+      continue;
+    _Layers[i]->ScaleThickness(thickness());
+  }
+  Canvas::postDraw();
 }
 
 void AppCanvas::Erase()
diff --git a/source/blender/freestyle/intern/application/AppCanvas.h b/source/blender/freestyle/intern/application/AppCanvas.h
index 42b3c7fdb50..59ed2af3bdd 100755
--- a/source/blender/freestyle/intern/application/AppCanvas.h
+++ b/source/blender/freestyle/intern/application/AppCanvas.h
@@ -41,6 +41,7 @@ public:
   virtual int width() const ;
   virtual int height() const ;
   virtual BBox<Vec2i> border() const ;
+  virtual float thickness() const ;
 
 	AppView *_pViewer;
   inline const AppView * viewer() const {return _pViewer;}
diff --git a/source/blender/freestyle/intern/application/AppView.h b/source/blender/freestyle/intern/application/AppView.h
index d23172c9f8d..d9b53019a93 100644
--- a/source/blender/freestyle/intern/application/AppView.h
+++ b/source/blender/freestyle/intern/application/AppView.h
@@ -30,15 +30,18 @@ public:
 		inline unsigned int width() { return _width; }
 		inline unsigned int height() { return _height; }
 		inline BBox<Vec2i> border() { return _border; }
+		inline float thickness() { return _thickness; }
 		inline void setWidth( unsigned int width ) { _width = width; }
 		inline void setHeight( unsigned int height ) { _height = height; }
 		inline void setBorder( int xmin, int ymin, int xmax, int ymax ) {
 			_border = BBox<Vec2i>(Vec2i(xmin, ymin), Vec2i(xmax, ymax));
 		}
+		inline void setThickness( float thickness ) { _thickness = thickness; }
 		
 protected:
 	unsigned int _width, _height;
 	BBox<Vec2i> _border;
+	float _thickness;
 
 public: