2 files changed, 15 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index 76c9023df57..707f4e7118c 100755
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -114,6 +114,7 @@ Controller::Controller()
   _ComputeRidges = true;
   _ComputeSteerableViewMap = false;
   _ComputeSuggestive = true;
+  _ComputeMaterialBoundaries = true;
   _sphereRadius = 1.0;
 
 	init_options();
@@ -466,6 +467,7 @@ void Controller::ComputeViewMap()
   edgeDetector.enableOrthographicProjection(proj[3][3] != 0.0);
   edgeDetector.enableRidgesAndValleysFlag(_ComputeRidges);
   edgeDetector.enableSuggestiveContours(_ComputeSuggestive);
+  edgeDetector.enableMaterialBoundaries(_ComputeMaterialBoundaries);
   edgeDetector.setSphereRadius(_sphereRadius);
   edgeDetector.setSuggestiveContourKrDerivativeEpsilon(_suggestiveContourKrDerivativeEpsilon);
   edgeDetector.processShapes(*_winged_edge);
@@ -647,6 +649,7 @@ void Controller::setComputeRidgesAndValleysFlag(bool iBool){
 bool Controller::getComputeRidgesAndValleysFlag() const {
   return _ComputeRidges;
 }
+
 void Controller::setComputeSuggestiveContoursFlag(bool b){
   _ComputeSuggestive = b;
 }
@@ -654,6 +657,15 @@ void Controller::setComputeSuggestiveContoursFlag(bool b){
 bool Controller::getComputeSuggestiveContoursFlag() const {
   return _ComputeSuggestive;
 }
+
+void Controller::setComputeMaterialBoundariesFlag(bool b){
+  _ComputeMaterialBoundaries = b;
+}
+  
+bool Controller::getComputeMaterialBoundariesFlag() const {
+  return _ComputeMaterialBoundaries;
+}
+
 void Controller::setComputeSteerableViewMapFlag(bool iBool){
   _ComputeSteerableViewMap = iBool;
 }
diff --git a/source/blender/freestyle/intern/application/Controller.h b/source/blender/freestyle/intern/application/Controller.h
index 422707d3c1f..739e49c16ca 100755
--- a/source/blender/freestyle/intern/application/Controller.h
+++ b/source/blender/freestyle/intern/application/Controller.h
@@ -119,6 +119,8 @@ public:
   bool getComputeRidgesAndValleysFlag() const ;
   void setComputeSuggestiveContoursFlag(bool b);
   bool getComputeSuggestiveContoursFlag() const ;
+  void setComputeMaterialBoundariesFlag(bool b);
+  bool getComputeMaterialBoundariesFlag() const ;
 
   void setComputeSteerableViewMapFlag(bool iBool);
   bool getComputeSteerableViewMapFlag() const;
@@ -222,6 +224,7 @@ private:
   bool _EnableQI;
   bool _ComputeRidges;
   bool _ComputeSuggestive;
+  bool _ComputeMaterialBoundaries;
   real _sphereRadius;
   real _suggestiveContourKrDerivativeEpsilon;