soc-2008-mxcurioni: merged changes to revision 14747, cosmetic changes for source/blender/freestyle

300 files changed, 0 insertions, 0 deletions

diff --git a/source/blender/freestyle/AUTHORS.TXT b/source/blender/freestyle/intern/AUTHORS.TXT
index 27cdb70d5ec..27cdb70d5ec 100755
--- a/source/blender/freestyle/AUTHORS.TXT
+++ b/source/blender/freestyle/intern/AUTHORS.TXT
diff --git a/source/blender/freestyle/BUGS.TXT b/source/blender/freestyle/intern/BUGS.TXT
index c5bad029a47..c5bad029a47 100755
--- a/source/blender/freestyle/BUGS.TXT
+++ b/source/blender/freestyle/intern/BUGS.TXT
diff --git a/source/blender/freestyle/CHANGELOG.TXT b/source/blender/freestyle/intern/CHANGELOG.TXT
index cb9f088bc1f..cb9f088bc1f 100755
--- a/source/blender/freestyle/CHANGELOG.TXT
+++ b/source/blender/freestyle/intern/CHANGELOG.TXT
diff --git a/source/blender/freestyle/COPYRIGHT.TXT b/source/blender/freestyle/intern/COPYRIGHT.TXT
index cd37bd16786..cd37bd16786 100755
--- a/source/blender/freestyle/COPYRIGHT.TXT
+++ b/source/blender/freestyle/intern/COPYRIGHT.TXT
diff --git a/source/blender/freestyle/src/Config.pri b/source/blender/freestyle/intern/Config.pri
index 68763dba502..68763dba502 100755
--- a/source/blender/freestyle/src/Config.pri
+++ b/source/blender/freestyle/intern/Config.pri
diff --git a/source/blender/freestyle/src/Freestyle-vc7-debug.sln b/source/blender/freestyle/intern/Freestyle-vc7-debug.sln
index 937f3f9faf9..937f3f9faf9 100755
--- a/source/blender/freestyle/src/Freestyle-vc7-debug.sln
+++ b/source/blender/freestyle/intern/Freestyle-vc7-debug.sln
diff --git a/source/blender/freestyle/src/Freestyle-vc7-release.sln b/source/blender/freestyle/intern/Freestyle-vc7-release.sln
index 74d5dc77f86..74d5dc77f86 100755
--- a/source/blender/freestyle/src/Freestyle-vc7-release.sln
+++ b/source/blender/freestyle/intern/Freestyle-vc7-release.sln
diff --git a/source/blender/freestyle/src/Freestyle-vc8-debug.sln b/source/blender/freestyle/intern/Freestyle-vc8-debug.sln
index 097ca30a174..097ca30a174 100755
--- a/source/blender/freestyle/src/Freestyle-vc8-debug.sln
+++ b/source/blender/freestyle/intern/Freestyle-vc8-debug.sln
diff --git a/source/blender/freestyle/src/Freestyle-vc8-release.sln b/source/blender/freestyle/intern/Freestyle-vc8-release.sln
index 82b22ff0c3e..82b22ff0c3e 100755
--- a/source/blender/freestyle/src/Freestyle-vc8-release.sln
+++ b/source/blender/freestyle/intern/Freestyle-vc8-release.sln
diff --git a/source/blender/freestyle/INSTALL.TXT b/source/blender/freestyle/intern/INSTALL.TXT
index 4fab1275116..4fab1275116 100755
--- a/source/blender/freestyle/INSTALL.TXT
+++ b/source/blender/freestyle/intern/INSTALL.TXT
diff --git a/source/blender/freestyle/LICENSE.TXT b/source/blender/freestyle/intern/LICENSE.TXT
index 5b6e7c66c27..5b6e7c66c27 100755
--- a/source/blender/freestyle/LICENSE.TXT
+++ b/source/blender/freestyle/intern/LICENSE.TXT
diff --git a/source/blender/freestyle/src/Makefile.pro b/source/blender/freestyle/intern/Makefile.pro
index 0e64bb342c3..0e64bb342c3 100755
--- a/source/blender/freestyle/src/Makefile.pro
+++ b/source/blender/freestyle/intern/Makefile.pro
diff --git a/source/blender/freestyle/README.TXT b/source/blender/freestyle/intern/README.TXT
index b0d026c8b9b..b0d026c8b9b 100755
--- a/source/blender/freestyle/README.TXT
+++ b/source/blender/freestyle/intern/README.TXT
diff --git a/source/blender/freestyle/THANKS.TXT b/source/blender/freestyle/intern/THANKS.TXT
index 3147715a63f..3147715a63f 100755
--- a/source/blender/freestyle/THANKS.TXT
+++ b/source/blender/freestyle/intern/THANKS.TXT
diff --git a/source/blender/freestyle/TODO.TXT b/source/blender/freestyle/intern/TODO.TXT
index 2e24752e026..2e24752e026 100755
--- a/source/blender/freestyle/TODO.TXT
+++ b/source/blender/freestyle/intern/TODO.TXT
diff --git a/source/blender/freestyle/src/app/AppAboutWindow.cpp b/source/blender/freestyle/intern/app/AppAboutWindow.cpp
index d20e3f4e1ac..d20e3f4e1ac 100755
--- a/source/blender/freestyle/src/app/AppAboutWindow.cpp
+++ b/source/blender/freestyle/intern/app/AppAboutWindow.cpp
diff --git a/source/blender/freestyle/src/app/AppAboutWindow.h b/source/blender/freestyle/intern/app/AppAboutWindow.h
index ee04d27ae71..ee04d27ae71 100755
--- a/source/blender/freestyle/src/app/AppAboutWindow.h
+++ b/source/blender/freestyle/intern/app/AppAboutWindow.h
diff --git a/source/blender/freestyle/src/app/AppCanvas.cpp b/source/blender/freestyle/intern/app/AppCanvas.cpp
index 60d36880c12..60d36880c12 100755
--- a/source/blender/freestyle/src/app/AppCanvas.cpp
+++ b/source/blender/freestyle/intern/app/AppCanvas.cpp
diff --git a/source/blender/freestyle/src/app/AppCanvas.h b/source/blender/freestyle/intern/app/AppCanvas.h
index 703970c0fb1..703970c0fb1 100755
--- a/source/blender/freestyle/src/app/AppCanvas.h
+++ b/source/blender/freestyle/intern/app/AppCanvas.h
diff --git a/source/blender/freestyle/src/app/AppConfig.cpp b/source/blender/freestyle/intern/app/AppConfig.cpp
index 217f58ee806..217f58ee806 100755
--- a/source/blender/freestyle/src/app/AppConfig.cpp
+++ b/source/blender/freestyle/intern/app/AppConfig.cpp
diff --git a/source/blender/freestyle/src/app/AppConfig.h b/source/blender/freestyle/intern/app/AppConfig.h
index 54e00571275..54e00571275 100755
--- a/source/blender/freestyle/src/app/AppConfig.h
+++ b/source/blender/freestyle/intern/app/AppConfig.h
diff --git a/source/blender/freestyle/src/app/AppDensityCurvesWindow.cpp b/source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp
index fe2ae994f77..fe2ae994f77 100755
--- a/source/blender/freestyle/src/app/AppDensityCurvesWindow.cpp
+++ b/source/blender/freestyle/intern/app/AppDensityCurvesWindow.cpp
diff --git a/source/blender/freestyle/src/app/AppDensityCurvesWindow.h b/source/blender/freestyle/intern/app/AppDensityCurvesWindow.h
index d7091440e06..d7091440e06 100755
--- a/source/blender/freestyle/src/app/AppDensityCurvesWindow.h
+++ b/source/blender/freestyle/intern/app/AppDensityCurvesWindow.h
diff --git a/source/blender/freestyle/src/app/AppGL2DCurvesViewer.cpp b/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp
index 0915a4c3cbd..0915a4c3cbd 100755
--- a/source/blender/freestyle/src/app/AppGL2DCurvesViewer.cpp
+++ b/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.cpp
diff --git a/source/blender/freestyle/src/app/AppGL2DCurvesViewer.h b/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.h
index c0bb8b4109c..c0bb8b4109c 100755
--- a/source/blender/freestyle/src/app/AppGL2DCurvesViewer.h
+++ b/source/blender/freestyle/intern/app/AppGL2DCurvesViewer.h
diff --git a/source/blender/freestyle/src/app/AppGLWidget.cpp b/source/blender/freestyle/intern/app/AppGLWidget.cpp
index d59ad716c18..d59ad716c18 100755
--- a/source/blender/freestyle/src/app/AppGLWidget.cpp
+++ b/source/blender/freestyle/intern/app/AppGLWidget.cpp
diff --git a/source/blender/freestyle/src/app/AppGLWidget.h b/source/blender/freestyle/intern/app/AppGLWidget.h
index 24bb2c7229b..24bb2c7229b 100755
--- a/source/blender/freestyle/src/app/AppGLWidget.h
+++ b/source/blender/freestyle/intern/app/AppGLWidget.h
diff --git a/source/blender/freestyle/src/app/AppInteractiveShaderWindow.cpp b/source/blender/freestyle/intern/app/AppInteractiveShaderWindow.cpp
index b074c85f9f9..b074c85f9f9 100755
--- a/source/blender/freestyle/src/app/AppInteractiveShaderWindow.cpp
+++ b/source/blender/freestyle/intern/app/AppInteractiveShaderWindow.cpp
diff --git a/source/blender/freestyle/src/app/AppInteractiveShaderWindow.h b/source/blender/freestyle/intern/app/AppInteractiveShaderWindow.h
index 58f2aa1f01a..58f2aa1f01a 100755
--- a/source/blender/freestyle/src/app/AppInteractiveShaderWindow.h
+++ b/source/blender/freestyle/intern/app/AppInteractiveShaderWindow.h
diff --git a/source/blender/freestyle/src/app/AppMainWindow.cpp b/source/blender/freestyle/intern/app/AppMainWindow.cpp
index 03b4f3a28ea..03b4f3a28ea 100755
--- a/source/blender/freestyle/src/app/AppMainWindow.cpp
+++ b/source/blender/freestyle/intern/app/AppMainWindow.cpp
diff --git a/source/blender/freestyle/src/app/AppMainWindow.h b/source/blender/freestyle/intern/app/AppMainWindow.h
index 750283f85ba..750283f85ba 100755
--- a/source/blender/freestyle/src/app/AppMainWindow.h
+++ b/source/blender/freestyle/intern/app/AppMainWindow.h
diff --git a/source/blender/freestyle/src/app/AppOptionsWindow.cpp b/source/blender/freestyle/intern/app/AppOptionsWindow.cpp
index 6c3dc9a83aa..6c3dc9a83aa 100755
--- a/source/blender/freestyle/src/app/AppOptionsWindow.cpp
+++ b/source/blender/freestyle/intern/app/AppOptionsWindow.cpp
diff --git a/source/blender/freestyle/src/app/AppOptionsWindow.h b/source/blender/freestyle/intern/app/AppOptionsWindow.h
index aaa964739a6..aaa964739a6 100755
--- a/source/blender/freestyle/src/app/AppOptionsWindow.h
+++ b/source/blender/freestyle/intern/app/AppOptionsWindow.h
diff --git a/source/blender/freestyle/src/app/AppProgressBar.cpp b/source/blender/freestyle/intern/app/AppProgressBar.cpp
index a4d18d07dd3..a4d18d07dd3 100755
--- a/source/blender/freestyle/src/app/AppProgressBar.cpp
+++ b/source/blender/freestyle/intern/app/AppProgressBar.cpp
diff --git a/source/blender/freestyle/src/app/AppProgressBar.h b/source/blender/freestyle/intern/app/AppProgressBar.h
index 09cc500a981..09cc500a981 100755
--- a/source/blender/freestyle/src/app/AppProgressBar.h
+++ b/source/blender/freestyle/intern/app/AppProgressBar.h
diff --git a/source/blender/freestyle/src/app/AppStyleWindow.cpp b/source/blender/freestyle/intern/app/AppStyleWindow.cpp
index d8be753b498..d8be753b498 100755
--- a/source/blender/freestyle/src/app/AppStyleWindow.cpp
+++ b/source/blender/freestyle/intern/app/AppStyleWindow.cpp
diff --git a/source/blender/freestyle/src/app/AppStyleWindow.h b/source/blender/freestyle/intern/app/AppStyleWindow.h
index a9339abf9c8..a9339abf9c8 100755
--- a/source/blender/freestyle/src/app/AppStyleWindow.h
+++ b/source/blender/freestyle/intern/app/AppStyleWindow.h
diff --git a/source/blender/freestyle/src/app/ConfigIO.cpp b/source/blender/freestyle/intern/app/ConfigIO.cpp
index 8165deb07fd..8165deb07fd 100755
--- a/source/blender/freestyle/src/app/ConfigIO.cpp
+++ b/source/blender/freestyle/intern/app/ConfigIO.cpp
diff --git a/source/blender/freestyle/src/app/ConfigIO.h b/source/blender/freestyle/intern/app/ConfigIO.h
index 15f3cd07575..15f3cd07575 100755
--- a/source/blender/freestyle/src/app/ConfigIO.h
+++ b/source/blender/freestyle/intern/app/ConfigIO.h
diff --git a/source/blender/freestyle/src/app/Controller.cpp b/source/blender/freestyle/intern/app/Controller.cpp
index ac41b31ac78..ac41b31ac78 100755
--- a/source/blender/freestyle/src/app/Controller.cpp
+++ b/source/blender/freestyle/intern/app/Controller.cpp
diff --git a/source/blender/freestyle/src/app/Controller.h b/source/blender/freestyle/intern/app/Controller.h
index 95b97ebcda3..95b97ebcda3 100755
--- a/source/blender/freestyle/src/app/Controller.h
+++ b/source/blender/freestyle/intern/app/Controller.h
diff --git a/source/blender/freestyle/src/app/Main.cpp b/source/blender/freestyle/intern/app/Main.cpp
index ae4d28017c5..ae4d28017c5 100755
--- a/source/blender/freestyle/src/app/Main.cpp
+++ b/source/blender/freestyle/intern/app/Main.cpp
diff --git a/source/blender/freestyle/src/app/QGLBasicWidget.cpp b/source/blender/freestyle/intern/app/QGLBasicWidget.cpp
index 44b5e0de224..44b5e0de224 100755
--- a/source/blender/freestyle/src/app/QGLBasicWidget.cpp
+++ b/source/blender/freestyle/intern/app/QGLBasicWidget.cpp
diff --git a/source/blender/freestyle/src/app/QGLBasicWidget.h b/source/blender/freestyle/intern/app/QGLBasicWidget.h
index 9b29a641f28..9b29a641f28 100755
--- a/source/blender/freestyle/src/app/QGLBasicWidget.h
+++ b/source/blender/freestyle/intern/app/QGLBasicWidget.h
diff --git a/source/blender/freestyle/src/app/QStyleModuleSyntaxHighlighter.cpp b/source/blender/freestyle/intern/app/QStyleModuleSyntaxHighlighter.cpp
index 16ea53f157c..16ea53f157c 100755
--- a/source/blender/freestyle/src/app/QStyleModuleSyntaxHighlighter.cpp
+++ b/source/blender/freestyle/intern/app/QStyleModuleSyntaxHighlighter.cpp
diff --git a/source/blender/freestyle/src/app/QStyleModuleSyntaxHighlighter.h b/source/blender/freestyle/intern/app/QStyleModuleSyntaxHighlighter.h
index ff3591ac45d..ff3591ac45d 100755
--- a/source/blender/freestyle/src/app/QStyleModuleSyntaxHighlighter.h
+++ b/source/blender/freestyle/intern/app/QStyleModuleSyntaxHighlighter.h
diff --git a/source/blender/freestyle/src/app/app.pro b/source/blender/freestyle/intern/app/app.pro
index e2ba9aec6f7..e2ba9aec6f7 100755
--- a/source/blender/freestyle/src/app/app.pro
+++ b/source/blender/freestyle/intern/app/app.pro
diff --git a/source/blender/freestyle/src/app/appmainwindowbase4.ui b/source/blender/freestyle/intern/app/appmainwindowbase4.ui
index 13e758d49dd..13e758d49dd 100755
--- a/source/blender/freestyle/src/app/appmainwindowbase4.ui
+++ b/source/blender/freestyle/intern/app/appmainwindowbase4.ui
diff --git a/source/blender/freestyle/src/app/densitycurveswindow4.ui b/source/blender/freestyle/intern/app/densitycurveswindow4.ui
index 1a35e3247d1..1a35e3247d1 100755
--- a/source/blender/freestyle/src/app/densitycurveswindow4.ui
+++ b/source/blender/freestyle/intern/app/densitycurveswindow4.ui
diff --git a/source/blender/freestyle/src/app/freestyle.qrc b/source/blender/freestyle/intern/app/freestyle.qrc
index b37a6702af6..b37a6702af6 100755
--- a/source/blender/freestyle/src/app/freestyle.qrc
+++ b/source/blender/freestyle/intern/app/freestyle.qrc
diff --git a/source/blender/freestyle/src/app/icons/add.png b/source/blender/freestyle/intern/app/icons/add.png
index d3388dcb3a9..d3388dcb3a9 100755
--- a/source/blender/freestyle/src/app/icons/add.png
+++ b/source/blender/freestyle/intern/app/icons/add.png
diff --git a/source/blender/freestyle/src/app/icons/arrow_down.png b/source/blender/freestyle/intern/app/icons/arrow_down.png
index 6cf2e9bba26..6cf2e9bba26 100755
--- a/source/blender/freestyle/src/app/icons/arrow_down.png
+++ b/source/blender/freestyle/intern/app/icons/arrow_down.png
diff --git a/source/blender/freestyle/src/app/icons/arrow_left.png b/source/blender/freestyle/intern/app/icons/arrow_left.png
index 72a5c462af6..72a5c462af6 100755
--- a/source/blender/freestyle/src/app/icons/arrow_left.png
+++ b/source/blender/freestyle/intern/app/icons/arrow_left.png
diff --git a/source/blender/freestyle/src/app/icons/arrow_right.png b/source/blender/freestyle/intern/app/icons/arrow_right.png
index f7e5c3b37e3..f7e5c3b37e3 100755
--- a/source/blender/freestyle/src/app/icons/arrow_right.png
+++ b/source/blender/freestyle/intern/app/icons/arrow_right.png
diff --git a/source/blender/freestyle/src/app/icons/arrow_up.png b/source/blender/freestyle/intern/app/icons/arrow_up.png
index 993a574b15a..993a574b15a 100755
--- a/source/blender/freestyle/src/app/icons/arrow_up.png
+++ b/source/blender/freestyle/intern/app/icons/arrow_up.png
diff --git a/source/blender/freestyle/src/app/icons/clear.png b/source/blender/freestyle/intern/app/icons/clear.png
index 1e3b2e37bd9..1e3b2e37bd9 100755
--- a/source/blender/freestyle/src/app/icons/clear.png
+++ b/source/blender/freestyle/intern/app/icons/clear.png
diff --git a/source/blender/freestyle/src/app/icons/close.png b/source/blender/freestyle/intern/app/icons/close.png
index 2042ec3d1ba..2042ec3d1ba 100755
--- a/source/blender/freestyle/src/app/icons/close.png
+++ b/source/blender/freestyle/intern/app/icons/close.png
diff --git a/source/blender/freestyle/src/app/icons/edit.png b/source/blender/freestyle/intern/app/icons/edit.png
index 244751b1933..244751b1933 100755
--- a/source/blender/freestyle/src/app/icons/edit.png
+++ b/source/blender/freestyle/intern/app/icons/edit.png
diff --git a/source/blender/freestyle/src/app/icons/eye0.png b/source/blender/freestyle/intern/app/icons/eye0.png
index 5f6d873cb0c..5f6d873cb0c 100755
--- a/source/blender/freestyle/src/app/icons/eye0.png
+++ b/source/blender/freestyle/intern/app/icons/eye0.png
diff --git a/source/blender/freestyle/src/app/icons/eye1.png b/source/blender/freestyle/intern/app/icons/eye1.png
index f762b66b482..f762b66b482 100755
--- a/source/blender/freestyle/src/app/icons/eye1.png
+++ b/source/blender/freestyle/intern/app/icons/eye1.png
diff --git a/source/blender/freestyle/src/app/icons/folder.png b/source/blender/freestyle/intern/app/icons/folder.png
index 3a99ad5ee92..3a99ad5ee92 100755
--- a/source/blender/freestyle/src/app/icons/folder.png
+++ b/source/blender/freestyle/intern/app/icons/folder.png
diff --git a/source/blender/freestyle/src/app/icons/home.png b/source/blender/freestyle/intern/app/icons/home.png
index ec4b22098b2..ec4b22098b2 100755
--- a/source/blender/freestyle/src/app/icons/home.png
+++ b/source/blender/freestyle/intern/app/icons/home.png
diff --git a/source/blender/freestyle/src/app/icons/mod0.png b/source/blender/freestyle/intern/app/icons/mod0.png
index 816d814528a..816d814528a 100755
--- a/source/blender/freestyle/src/app/icons/mod0.png
+++ b/source/blender/freestyle/intern/app/icons/mod0.png
diff --git a/source/blender/freestyle/src/app/icons/mod1.png b/source/blender/freestyle/intern/app/icons/mod1.png
index c7c66183800..c7c66183800 100755
--- a/source/blender/freestyle/src/app/icons/mod1.png
+++ b/source/blender/freestyle/intern/app/icons/mod1.png
diff --git a/source/blender/freestyle/src/app/icons/ok.png b/source/blender/freestyle/intern/app/icons/ok.png
index 31c064ba922..31c064ba922 100755
--- a/source/blender/freestyle/src/app/icons/ok.png
+++ b/source/blender/freestyle/intern/app/icons/ok.png
diff --git a/source/blender/freestyle/src/app/icons/reload.png b/source/blender/freestyle/intern/app/icons/reload.png
index d26c280f1ac..d26c280f1ac 100755
--- a/source/blender/freestyle/src/app/icons/reload.png
+++ b/source/blender/freestyle/intern/app/icons/reload.png
diff --git a/source/blender/freestyle/src/app/icons/remove.png b/source/blender/freestyle/intern/app/icons/remove.png
index 86d8c38a7f8..86d8c38a7f8 100755
--- a/source/blender/freestyle/src/app/icons/remove.png
+++ b/source/blender/freestyle/intern/app/icons/remove.png
diff --git a/source/blender/freestyle/src/app/icons/save.png b/source/blender/freestyle/intern/app/icons/save.png
index 932100d98e9..932100d98e9 100755
--- a/source/blender/freestyle/src/app/icons/save.png
+++ b/source/blender/freestyle/intern/app/icons/save.png
diff --git a/source/blender/freestyle/src/app/icons/save_as.png b/source/blender/freestyle/intern/app/icons/save_as.png
index 2c8b3f3e7b4..2c8b3f3e7b4 100755
--- a/source/blender/freestyle/src/app/icons/save_as.png
+++ b/source/blender/freestyle/intern/app/icons/save_as.png
diff --git a/source/blender/freestyle/src/app/interactiveshaderwindow4.ui b/source/blender/freestyle/intern/app/interactiveshaderwindow4.ui
index e17442ad43e..e17442ad43e 100755
--- a/source/blender/freestyle/src/app/interactiveshaderwindow4.ui
+++ b/source/blender/freestyle/intern/app/interactiveshaderwindow4.ui
diff --git a/source/blender/freestyle/src/app/optionswindow4.ui b/source/blender/freestyle/intern/app/optionswindow4.ui
index 48c322c6d84..48c322c6d84 100755
--- a/source/blender/freestyle/src/app/optionswindow4.ui
+++ b/source/blender/freestyle/intern/app/optionswindow4.ui
diff --git a/source/blender/freestyle/src/app/progressdialog4.ui b/source/blender/freestyle/intern/app/progressdialog4.ui
index 78cc67ed440..78cc67ed440 100755
--- a/source/blender/freestyle/src/app/progressdialog4.ui
+++ b/source/blender/freestyle/intern/app/progressdialog4.ui
diff --git a/source/blender/freestyle/src/app/src.pri b/source/blender/freestyle/intern/app/src.pri
index 2fcc9146216..2fcc9146216 100755
--- a/source/blender/freestyle/src/app/src.pri
+++ b/source/blender/freestyle/intern/app/src.pri
diff --git a/source/blender/freestyle/src/app/stylewindow4.ui b/source/blender/freestyle/intern/app/stylewindow4.ui
index c4ff5f656ae..c4ff5f656ae 100755
--- a/source/blender/freestyle/src/app/stylewindow4.ui
+++ b/source/blender/freestyle/intern/app/stylewindow4.ui
diff --git a/source/blender/freestyle/src/build_bundle.macosx.py b/source/blender/freestyle/intern/build_bundle.macosx.py
index e97153f269c..e97153f269c 100755
--- a/source/blender/freestyle/src/build_bundle.macosx.py
+++ b/source/blender/freestyle/intern/build_bundle.macosx.py
diff --git a/source/blender/freestyle/src/geometry/BBox.h b/source/blender/freestyle/intern/geometry/BBox.h
index 9c46d7918e2..9c46d7918e2 100755
--- a/source/blender/freestyle/src/geometry/BBox.h
+++ b/source/blender/freestyle/intern/geometry/BBox.h
diff --git a/source/blender/freestyle/src/geometry/Bezier.cpp b/source/blender/freestyle/intern/geometry/Bezier.cpp
index 8f9771f29d3..8f9771f29d3 100755
--- a/source/blender/freestyle/src/geometry/Bezier.cpp
+++ b/source/blender/freestyle/intern/geometry/Bezier.cpp
diff --git a/source/blender/freestyle/src/geometry/Bezier.h b/source/blender/freestyle/intern/geometry/Bezier.h
index acae71bbb2c..acae71bbb2c 100755
--- a/source/blender/freestyle/src/geometry/Bezier.h
+++ b/source/blender/freestyle/intern/geometry/Bezier.h
diff --git a/source/blender/freestyle/src/geometry/FastGrid.cpp b/source/blender/freestyle/intern/geometry/FastGrid.cpp
index b090a3df67f..b090a3df67f 100755
--- a/source/blender/freestyle/src/geometry/FastGrid.cpp
+++ b/source/blender/freestyle/intern/geometry/FastGrid.cpp
diff --git a/source/blender/freestyle/src/geometry/FastGrid.h b/source/blender/freestyle/intern/geometry/FastGrid.h
index e620ff24385..e620ff24385 100755
--- a/source/blender/freestyle/src/geometry/FastGrid.h
+++ b/source/blender/freestyle/intern/geometry/FastGrid.h
diff --git a/source/blender/freestyle/src/geometry/FitCurve.cpp b/source/blender/freestyle/intern/geometry/FitCurve.cpp
index ade40b050ca..ade40b050ca 100755
--- a/source/blender/freestyle/src/geometry/FitCurve.cpp
+++ b/source/blender/freestyle/intern/geometry/FitCurve.cpp
diff --git a/source/blender/freestyle/src/geometry/FitCurve.h b/source/blender/freestyle/intern/geometry/FitCurve.h
index ed7cbe34780..ed7cbe34780 100755
--- a/source/blender/freestyle/src/geometry/FitCurve.h
+++ b/source/blender/freestyle/intern/geometry/FitCurve.h
diff --git a/source/blender/freestyle/src/geometry/Geom.h b/source/blender/freestyle/intern/geometry/Geom.h
index ac94213fe98..ac94213fe98 100755
--- a/source/blender/freestyle/src/geometry/Geom.h
+++ b/source/blender/freestyle/intern/geometry/Geom.h
diff --git a/source/blender/freestyle/src/geometry/GeomCleaner.cpp b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
index c148c521a46..c148c521a46 100755
--- a/source/blender/freestyle/src/geometry/GeomCleaner.cpp
+++ b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp
diff --git a/source/blender/freestyle/src/geometry/GeomCleaner.h b/source/blender/freestyle/intern/geometry/GeomCleaner.h
index d78d90ccb4a..d78d90ccb4a 100755
--- a/source/blender/freestyle/src/geometry/GeomCleaner.h
+++ b/source/blender/freestyle/intern/geometry/GeomCleaner.h
diff --git a/source/blender/freestyle/src/geometry/GeomUtils.cpp b/source/blender/freestyle/intern/geometry/GeomUtils.cpp
index fd36e81ca77..fd36e81ca77 100755
--- a/source/blender/freestyle/src/geometry/GeomUtils.cpp
+++ b/source/blender/freestyle/intern/geometry/GeomUtils.cpp
diff --git a/source/blender/freestyle/src/geometry/GeomUtils.h b/source/blender/freestyle/intern/geometry/GeomUtils.h
index 53c94c22f8b..53c94c22f8b 100755
--- a/source/blender/freestyle/src/geometry/GeomUtils.h
+++ b/source/blender/freestyle/intern/geometry/GeomUtils.h
diff --git a/source/blender/freestyle/src/geometry/Grid.cpp b/source/blender/freestyle/intern/geometry/Grid.cpp
index 59b730358bc..59b730358bc 100755
--- a/source/blender/freestyle/src/geometry/Grid.cpp
+++ b/source/blender/freestyle/intern/geometry/Grid.cpp
diff --git a/source/blender/freestyle/src/geometry/Grid.h b/source/blender/freestyle/intern/geometry/Grid.h
index 6197721bb45..6197721bb45 100755
--- a/source/blender/freestyle/src/geometry/Grid.h
+++ b/source/blender/freestyle/intern/geometry/Grid.h
diff --git a/source/blender/freestyle/src/geometry/HashGrid.cpp b/source/blender/freestyle/intern/geometry/HashGrid.cpp
index 3cf845d57ef..3cf845d57ef 100755
--- a/source/blender/freestyle/src/geometry/HashGrid.cpp
+++ b/source/blender/freestyle/intern/geometry/HashGrid.cpp
diff --git a/source/blender/freestyle/src/geometry/HashGrid.h b/source/blender/freestyle/intern/geometry/HashGrid.h
index f6605957676..f6605957676 100755
--- a/source/blender/freestyle/src/geometry/HashGrid.h
+++ b/source/blender/freestyle/intern/geometry/HashGrid.h
diff --git a/source/blender/freestyle/src/geometry/Noise.cpp b/source/blender/freestyle/intern/geometry/Noise.cpp
index 396fc3bbb47..396fc3bbb47 100755
--- a/source/blender/freestyle/src/geometry/Noise.cpp
+++ b/source/blender/freestyle/intern/geometry/Noise.cpp
diff --git a/source/blender/freestyle/src/geometry/Noise.h b/source/blender/freestyle/intern/geometry/Noise.h
index 00cebbb451e..00cebbb451e 100755
--- a/source/blender/freestyle/src/geometry/Noise.h
+++ b/source/blender/freestyle/intern/geometry/Noise.h
diff --git a/source/blender/freestyle/src/geometry/Polygon.h b/source/blender/freestyle/intern/geometry/Polygon.h
index f9c4c78d424..f9c4c78d424 100755
--- a/source/blender/freestyle/src/geometry/Polygon.h
+++ b/source/blender/freestyle/intern/geometry/Polygon.h
diff --git a/source/blender/freestyle/src/geometry/SweepLine.h b/source/blender/freestyle/intern/geometry/SweepLine.h
index e3fb4ad8c0c..e3fb4ad8c0c 100755
--- a/source/blender/freestyle/src/geometry/SweepLine.h
+++ b/source/blender/freestyle/intern/geometry/SweepLine.h
diff --git a/source/blender/freestyle/src/geometry/VecMat.h b/source/blender/freestyle/intern/geometry/VecMat.h
index 9bbec3b1349..9bbec3b1349 100755
--- a/source/blender/freestyle/src/geometry/VecMat.h
+++ b/source/blender/freestyle/intern/geometry/VecMat.h
diff --git a/source/blender/freestyle/src/geometry/geometry.pro b/source/blender/freestyle/intern/geometry/geometry.pro
index a63aa6483b4..a63aa6483b4 100755
--- a/source/blender/freestyle/src/geometry/geometry.pro
+++ b/source/blender/freestyle/intern/geometry/geometry.pro
diff --git a/source/blender/freestyle/src/geometry/matrix_util.cpp b/source/blender/freestyle/intern/geometry/matrix_util.cpp
index 2117b06e62f..2117b06e62f 100755
--- a/source/blender/freestyle/src/geometry/matrix_util.cpp
+++ b/source/blender/freestyle/intern/geometry/matrix_util.cpp
diff --git a/source/blender/freestyle/src/geometry/matrix_util.h b/source/blender/freestyle/intern/geometry/matrix_util.h
index a990413c403..a990413c403 100755
--- a/source/blender/freestyle/src/geometry/matrix_util.h
+++ b/source/blender/freestyle/intern/geometry/matrix_util.h
diff --git a/source/blender/freestyle/src/geometry/normal_cycle.cpp b/source/blender/freestyle/intern/geometry/normal_cycle.cpp
index b456ced8331..b456ced8331 100755
--- a/source/blender/freestyle/src/geometry/normal_cycle.cpp
+++ b/source/blender/freestyle/intern/geometry/normal_cycle.cpp
diff --git a/source/blender/freestyle/src/geometry/normal_cycle.h b/source/blender/freestyle/intern/geometry/normal_cycle.h
index 41fbf7b3fab..41fbf7b3fab 100755
--- a/source/blender/freestyle/src/geometry/normal_cycle.h
+++ b/source/blender/freestyle/intern/geometry/normal_cycle.h
diff --git a/source/blender/freestyle/src/geometry/src.pri b/source/blender/freestyle/intern/geometry/src.pri
index a35760fe892..a35760fe892 100755
--- a/source/blender/freestyle/src/geometry/src.pri
+++ b/source/blender/freestyle/intern/geometry/src.pri
diff --git a/source/blender/freestyle/src/image/GaussianFilter.cpp b/source/blender/freestyle/intern/image/GaussianFilter.cpp
index 97c2aedc62e..97c2aedc62e 100755
--- a/source/blender/freestyle/src/image/GaussianFilter.cpp
+++ b/source/blender/freestyle/intern/image/GaussianFilter.cpp
diff --git a/source/blender/freestyle/src/image/GaussianFilter.h b/source/blender/freestyle/intern/image/GaussianFilter.h
index c75177541d3..c75177541d3 100755
--- a/source/blender/freestyle/src/image/GaussianFilter.h
+++ b/source/blender/freestyle/intern/image/GaussianFilter.h
diff --git a/source/blender/freestyle/src/image/Image.h b/source/blender/freestyle/intern/image/Image.h
index 83d6785e32f..83d6785e32f 100755
--- a/source/blender/freestyle/src/image/Image.h
+++ b/source/blender/freestyle/intern/image/Image.h
diff --git a/source/blender/freestyle/src/image/ImagePyramid.cpp b/source/blender/freestyle/intern/image/ImagePyramid.cpp
index 45c02004d1c..45c02004d1c 100755
--- a/source/blender/freestyle/src/image/ImagePyramid.cpp
+++ b/source/blender/freestyle/intern/image/ImagePyramid.cpp
diff --git a/source/blender/freestyle/src/image/ImagePyramid.h b/source/blender/freestyle/intern/image/ImagePyramid.h
index 9e326757f02..9e326757f02 100755
--- a/source/blender/freestyle/src/image/ImagePyramid.h
+++ b/source/blender/freestyle/intern/image/ImagePyramid.h
diff --git a/source/blender/freestyle/src/image/image.pro b/source/blender/freestyle/intern/image/image.pro
index 133b6cf4f35..133b6cf4f35 100755
--- a/source/blender/freestyle/src/image/image.pro
+++ b/source/blender/freestyle/intern/image/image.pro
diff --git a/source/blender/freestyle/src/image/src.pri b/source/blender/freestyle/intern/image/src.pri
index c047929b49f..c047929b49f 100755
--- a/source/blender/freestyle/src/image/src.pri
+++ b/source/blender/freestyle/intern/image/src.pri
diff --git a/source/blender/freestyle/src/libconfig.pri b/source/blender/freestyle/intern/libconfig.pri
index 6fec8878694..6fec8878694 100755
--- a/source/blender/freestyle/src/libconfig.pri
+++ b/source/blender/freestyle/intern/libconfig.pri
diff --git a/source/blender/freestyle/src/makedsp.vcnet.debug.bat b/source/blender/freestyle/intern/makedsp.vcnet.debug.bat
index e19ca52b4f7..e19ca52b4f7 100755
--- a/source/blender/freestyle/src/makedsp.vcnet.debug.bat
+++ b/source/blender/freestyle/intern/makedsp.vcnet.debug.bat
diff --git a/source/blender/freestyle/src/makedsp.vcnet.release.bat b/source/blender/freestyle/intern/makedsp.vcnet.release.bat
index 3050a2fe4ea..3050a2fe4ea 100755
--- a/source/blender/freestyle/src/makedsp.vcnet.release.bat
+++ b/source/blender/freestyle/intern/makedsp.vcnet.release.bat
diff --git a/source/blender/freestyle/src/rendering/GLBBoxRenderer.cpp b/source/blender/freestyle/intern/rendering/GLBBoxRenderer.cpp
index 464779d6a43..464779d6a43 100755
--- a/source/blender/freestyle/src/rendering/GLBBoxRenderer.cpp
+++ b/source/blender/freestyle/intern/rendering/GLBBoxRenderer.cpp
diff --git a/source/blender/freestyle/src/rendering/GLBBoxRenderer.h b/source/blender/freestyle/intern/rendering/GLBBoxRenderer.h
index 4bb72ba80b0..4bb72ba80b0 100755
--- a/source/blender/freestyle/src/rendering/GLBBoxRenderer.h
+++ b/source/blender/freestyle/intern/rendering/GLBBoxRenderer.h
diff --git a/source/blender/freestyle/src/rendering/GLDebugRenderer.cpp b/source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp
index b396a0ce6d3..b396a0ce6d3 100755
--- a/source/blender/freestyle/src/rendering/GLDebugRenderer.cpp
+++ b/source/blender/freestyle/intern/rendering/GLDebugRenderer.cpp
diff --git a/source/blender/freestyle/src/rendering/GLDebugRenderer.h b/source/blender/freestyle/intern/rendering/GLDebugRenderer.h
index abf76d079da..abf76d079da 100755
--- a/source/blender/freestyle/src/rendering/GLDebugRenderer.h
+++ b/source/blender/freestyle/intern/rendering/GLDebugRenderer.h
diff --git a/source/blender/freestyle/src/rendering/GLFreeMemoryVisitor.cpp b/source/blender/freestyle/intern/rendering/GLFreeMemoryVisitor.cpp
index b5a835f5104..b5a835f5104 100644
--- a/source/blender/freestyle/src/rendering/GLFreeMemoryVisitor.cpp
+++ b/source/blender/freestyle/intern/rendering/GLFreeMemoryVisitor.cpp
diff --git a/source/blender/freestyle/src/rendering/GLFreeMemoryVisitor.h b/source/blender/freestyle/intern/rendering/GLFreeMemoryVisitor.h
index dd6412b1bb7..dd6412b1bb7 100644
--- a/source/blender/freestyle/src/rendering/GLFreeMemoryVisitor.h
+++ b/source/blender/freestyle/intern/rendering/GLFreeMemoryVisitor.h
diff --git a/source/blender/freestyle/src/rendering/GLMonoColorRenderer.cpp b/source/blender/freestyle/intern/rendering/GLMonoColorRenderer.cpp
index 792846fa020..792846fa020 100755
--- a/source/blender/freestyle/src/rendering/GLMonoColorRenderer.cpp
+++ b/source/blender/freestyle/intern/rendering/GLMonoColorRenderer.cpp
diff --git a/source/blender/freestyle/src/rendering/GLMonoColorRenderer.h b/source/blender/freestyle/intern/rendering/GLMonoColorRenderer.h
index d8e3cf536ec..d8e3cf536ec 100755
--- a/source/blender/freestyle/src/rendering/GLMonoColorRenderer.h
+++ b/source/blender/freestyle/intern/rendering/GLMonoColorRenderer.h
diff --git a/source/blender/freestyle/src/rendering/GLRenderer.cpp b/source/blender/freestyle/intern/rendering/GLRenderer.cpp
index d566060dfc7..d566060dfc7 100755
--- a/source/blender/freestyle/src/rendering/GLRenderer.cpp
+++ b/source/blender/freestyle/intern/rendering/GLRenderer.cpp
diff --git a/source/blender/freestyle/src/rendering/GLRenderer.h b/source/blender/freestyle/intern/rendering/GLRenderer.h
index ddbf082038b..ddbf082038b 100755
--- a/source/blender/freestyle/src/rendering/GLRenderer.h
+++ b/source/blender/freestyle/intern/rendering/GLRenderer.h
diff --git a/source/blender/freestyle/src/rendering/GLSelectRenderer.cpp b/source/blender/freestyle/intern/rendering/GLSelectRenderer.cpp
index b4a2406c644..b4a2406c644 100755
--- a/source/blender/freestyle/src/rendering/GLSelectRenderer.cpp
+++ b/source/blender/freestyle/intern/rendering/GLSelectRenderer.cpp
diff --git a/source/blender/freestyle/src/rendering/GLSelectRenderer.h b/source/blender/freestyle/intern/rendering/GLSelectRenderer.h
index bf8a334aebb..bf8a334aebb 100755
--- a/source/blender/freestyle/src/rendering/GLSelectRenderer.h
+++ b/source/blender/freestyle/intern/rendering/GLSelectRenderer.h
diff --git a/source/blender/freestyle/src/rendering/GLStrokeRenderer.cpp b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp
index 7525807da47..7525807da47 100755
--- a/source/blender/freestyle/src/rendering/GLStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.cpp
diff --git a/source/blender/freestyle/src/rendering/GLStrokeRenderer.h b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.h
index bef95996444..bef95996444 100755
--- a/source/blender/freestyle/src/rendering/GLStrokeRenderer.h
+++ b/source/blender/freestyle/intern/rendering/GLStrokeRenderer.h
diff --git a/source/blender/freestyle/src/rendering/GLUtils.cpp b/source/blender/freestyle/intern/rendering/GLUtils.cpp
index 5e9ba2a5bf4..5e9ba2a5bf4 100755
--- a/source/blender/freestyle/src/rendering/GLUtils.cpp
+++ b/source/blender/freestyle/intern/rendering/GLUtils.cpp
diff --git a/source/blender/freestyle/src/rendering/GLUtils.h b/source/blender/freestyle/intern/rendering/GLUtils.h
index 453b3f31259..453b3f31259 100755
--- a/source/blender/freestyle/src/rendering/GLUtils.h
+++ b/source/blender/freestyle/intern/rendering/GLUtils.h
diff --git a/source/blender/freestyle/src/rendering/GLXOffscreenViewer.cpp b/source/blender/freestyle/intern/rendering/GLXOffscreenViewer.cpp
index 7135cedd7ad..7135cedd7ad 100755
--- a/source/blender/freestyle/src/rendering/GLXOffscreenViewer.cpp
+++ b/source/blender/freestyle/intern/rendering/GLXOffscreenViewer.cpp
diff --git a/source/blender/freestyle/src/rendering/GLXOffscreenViewer.h b/source/blender/freestyle/intern/rendering/GLXOffscreenViewer.h
index c09a23f500b..c09a23f500b 100755
--- a/source/blender/freestyle/src/rendering/GLXOffscreenViewer.h
+++ b/source/blender/freestyle/intern/rendering/GLXOffscreenViewer.h
diff --git a/source/blender/freestyle/src/rendering/extgl.cpp b/source/blender/freestyle/intern/rendering/extgl.cpp
index d7207f21299..d7207f21299 100755
--- a/source/blender/freestyle/src/rendering/extgl.cpp
+++ b/source/blender/freestyle/intern/rendering/extgl.cpp
diff --git a/source/blender/freestyle/src/rendering/extgl.h b/source/blender/freestyle/intern/rendering/extgl.h
index 68c13dea3d2..68c13dea3d2 100755
--- a/source/blender/freestyle/src/rendering/extgl.h
+++ b/source/blender/freestyle/intern/rendering/extgl.h
diff --git a/source/blender/freestyle/src/rendering/pbuffer.cpp b/source/blender/freestyle/intern/rendering/pbuffer.cpp
index ec73fc52ae4..ec73fc52ae4 100755
--- a/source/blender/freestyle/src/rendering/pbuffer.cpp
+++ b/source/blender/freestyle/intern/rendering/pbuffer.cpp
diff --git a/source/blender/freestyle/src/rendering/pbuffer.h b/source/blender/freestyle/intern/rendering/pbuffer.h
index 7f11f461b1c..7f11f461b1c 100755
--- a/source/blender/freestyle/src/rendering/pbuffer.h
+++ b/source/blender/freestyle/intern/rendering/pbuffer.h
diff --git a/source/blender/freestyle/src/rendering/rendering.pro b/source/blender/freestyle/intern/rendering/rendering.pro
index 0bbca195b6b..0bbca195b6b 100755
--- a/source/blender/freestyle/src/rendering/rendering.pro
+++ b/source/blender/freestyle/intern/rendering/rendering.pro
diff --git a/source/blender/freestyle/src/rendering/src.pri b/source/blender/freestyle/intern/rendering/src.pri
index aee4cdb2782..aee4cdb2782 100755
--- a/source/blender/freestyle/src/rendering/src.pri
+++ b/source/blender/freestyle/intern/rendering/src.pri
diff --git a/source/blender/freestyle/src/scene_graph/DrawingStyle.h b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
index e2be6fa8264..e2be6fa8264 100755
--- a/source/blender/freestyle/src/scene_graph/DrawingStyle.h
+++ b/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
diff --git a/source/blender/freestyle/src/scene_graph/IndexedFaceSet.cpp b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
index ec3d3ad748c..ec3d3ad748c 100755
--- a/source/blender/freestyle/src/scene_graph/IndexedFaceSet.cpp
+++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.cpp
diff --git a/source/blender/freestyle/src/scene_graph/IndexedFaceSet.h b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
index c6951942dbb..c6951942dbb 100755
--- a/source/blender/freestyle/src/scene_graph/IndexedFaceSet.h
+++ b/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
diff --git a/source/blender/freestyle/src/scene_graph/LineRep.cpp b/source/blender/freestyle/intern/scene_graph/LineRep.cpp
index 9dec2ec803f..9dec2ec803f 100755
--- a/source/blender/freestyle/src/scene_graph/LineRep.cpp
+++ b/source/blender/freestyle/intern/scene_graph/LineRep.cpp
diff --git a/source/blender/freestyle/src/scene_graph/LineRep.h b/source/blender/freestyle/intern/scene_graph/LineRep.h
index 1bbba130ba3..1bbba130ba3 100755
--- a/source/blender/freestyle/src/scene_graph/LineRep.h
+++ b/source/blender/freestyle/intern/scene_graph/LineRep.h
diff --git a/source/blender/freestyle/src/scene_graph/Material.h b/source/blender/freestyle/intern/scene_graph/Material.h
index 09557ad3473..09557ad3473 100755
--- a/source/blender/freestyle/src/scene_graph/Material.h
+++ b/source/blender/freestyle/intern/scene_graph/Material.h
diff --git a/source/blender/freestyle/src/scene_graph/MaxFileLoader.cpp b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.cpp
index 515874c4021..515874c4021 100755
--- a/source/blender/freestyle/src/scene_graph/MaxFileLoader.cpp
+++ b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.cpp
diff --git a/source/blender/freestyle/src/scene_graph/MaxFileLoader.h b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h
index ab31e656d46..ab31e656d46 100755
--- a/source/blender/freestyle/src/scene_graph/MaxFileLoader.h
+++ b/source/blender/freestyle/intern/scene_graph/MaxFileLoader.h
diff --git a/source/blender/freestyle/src/scene_graph/Node.h b/source/blender/freestyle/intern/scene_graph/Node.h
index 1726dd3c853..1726dd3c853 100755
--- a/source/blender/freestyle/src/scene_graph/Node.h
+++ b/source/blender/freestyle/intern/scene_graph/Node.h
diff --git a/source/blender/freestyle/src/scene_graph/NodeCamera.cpp b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
index 2d850287ae5..2d850287ae5 100644
--- a/source/blender/freestyle/src/scene_graph/NodeCamera.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.cpp
diff --git a/source/blender/freestyle/src/scene_graph/NodeCamera.h b/source/blender/freestyle/intern/scene_graph/NodeCamera.h
index 76ccf465d38..76ccf465d38 100644
--- a/source/blender/freestyle/src/scene_graph/NodeCamera.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeCamera.h
diff --git a/source/blender/freestyle/src/scene_graph/NodeDrawingStyle.cpp b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.cpp
index acd740ee055..acd740ee055 100755
--- a/source/blender/freestyle/src/scene_graph/NodeDrawingStyle.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.cpp
diff --git a/source/blender/freestyle/src/scene_graph/NodeDrawingStyle.h b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
index 18442ae10f9..18442ae10f9 100755
--- a/source/blender/freestyle/src/scene_graph/NodeDrawingStyle.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
diff --git a/source/blender/freestyle/src/scene_graph/NodeGroup.cpp b/source/blender/freestyle/intern/scene_graph/NodeGroup.cpp
index 3d2aa2c8694..3d2aa2c8694 100755
--- a/source/blender/freestyle/src/scene_graph/NodeGroup.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeGroup.cpp
diff --git a/source/blender/freestyle/src/scene_graph/NodeGroup.h b/source/blender/freestyle/intern/scene_graph/NodeGroup.h
index a1bd2b57e56..a1bd2b57e56 100755
--- a/source/blender/freestyle/src/scene_graph/NodeGroup.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeGroup.h
diff --git a/source/blender/freestyle/src/scene_graph/NodeLight.cpp b/source/blender/freestyle/intern/scene_graph/NodeLight.cpp
index 61a46155cfa..61a46155cfa 100755
--- a/source/blender/freestyle/src/scene_graph/NodeLight.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeLight.cpp
diff --git a/source/blender/freestyle/src/scene_graph/NodeLight.h b/source/blender/freestyle/intern/scene_graph/NodeLight.h
index 0689505fb24..0689505fb24 100755
--- a/source/blender/freestyle/src/scene_graph/NodeLight.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeLight.h
diff --git a/source/blender/freestyle/src/scene_graph/NodeShape.cpp b/source/blender/freestyle/intern/scene_graph/NodeShape.cpp
index 2012ef83b9f..2012ef83b9f 100755
--- a/source/blender/freestyle/src/scene_graph/NodeShape.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeShape.cpp
diff --git a/source/blender/freestyle/src/scene_graph/NodeShape.h b/source/blender/freestyle/intern/scene_graph/NodeShape.h
index 3e963beec38..3e963beec38 100755
--- a/source/blender/freestyle/src/scene_graph/NodeShape.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeShape.h
diff --git a/source/blender/freestyle/src/scene_graph/NodeTransform.cpp b/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
index 64e9b7a4dd6..64e9b7a4dd6 100755
--- a/source/blender/freestyle/src/scene_graph/NodeTransform.cpp
+++ b/source/blender/freestyle/intern/scene_graph/NodeTransform.cpp
diff --git a/source/blender/freestyle/src/scene_graph/NodeTransform.h b/source/blender/freestyle/intern/scene_graph/NodeTransform.h
index 3929c60996b..3929c60996b 100755
--- a/source/blender/freestyle/src/scene_graph/NodeTransform.h
+++ b/source/blender/freestyle/intern/scene_graph/NodeTransform.h
diff --git a/source/blender/freestyle/src/scene_graph/OrientedLineRep.cpp b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp
index 2d0205308b9..2d0205308b9 100755
--- a/source/blender/freestyle/src/scene_graph/OrientedLineRep.cpp
+++ b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.cpp
diff --git a/source/blender/freestyle/src/scene_graph/OrientedLineRep.h b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h
index 4274581e39a..4274581e39a 100755
--- a/source/blender/freestyle/src/scene_graph/OrientedLineRep.h
+++ b/source/blender/freestyle/intern/scene_graph/OrientedLineRep.h
diff --git a/source/blender/freestyle/src/scene_graph/Rep.cpp b/source/blender/freestyle/intern/scene_graph/Rep.cpp
index 520d3c41e2e..520d3c41e2e 100755
--- a/source/blender/freestyle/src/scene_graph/Rep.cpp
+++ b/source/blender/freestyle/intern/scene_graph/Rep.cpp
diff --git a/source/blender/freestyle/src/scene_graph/Rep.h b/source/blender/freestyle/intern/scene_graph/Rep.h
index 6ccc2152c48..6ccc2152c48 100755
--- a/source/blender/freestyle/src/scene_graph/Rep.h
+++ b/source/blender/freestyle/intern/scene_graph/Rep.h
diff --git a/source/blender/freestyle/src/scene_graph/ScenePrettyPrinter.cpp b/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.cpp
index aeee87f8222..aeee87f8222 100755
--- a/source/blender/freestyle/src/scene_graph/ScenePrettyPrinter.cpp
+++ b/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.cpp
diff --git a/source/blender/freestyle/src/scene_graph/ScenePrettyPrinter.h b/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.h
index 4e83825ff55..4e83825ff55 100755
--- a/source/blender/freestyle/src/scene_graph/ScenePrettyPrinter.h
+++ b/source/blender/freestyle/intern/scene_graph/ScenePrettyPrinter.h
diff --git a/source/blender/freestyle/src/scene_graph/SceneVisitor.cpp b/source/blender/freestyle/intern/scene_graph/SceneVisitor.cpp
index 9cfb9d40d24..9cfb9d40d24 100755
--- a/source/blender/freestyle/src/scene_graph/SceneVisitor.cpp
+++ b/source/blender/freestyle/intern/scene_graph/SceneVisitor.cpp
diff --git a/source/blender/freestyle/src/scene_graph/SceneVisitor.h b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h
index c57bd2e0f6e..c57bd2e0f6e 100755
--- a/source/blender/freestyle/src/scene_graph/SceneVisitor.h
+++ b/source/blender/freestyle/intern/scene_graph/SceneVisitor.h
diff --git a/source/blender/freestyle/src/scene_graph/TriangleRep.cpp b/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp
index 215124b0676..215124b0676 100755
--- a/source/blender/freestyle/src/scene_graph/TriangleRep.cpp
+++ b/source/blender/freestyle/intern/scene_graph/TriangleRep.cpp
diff --git a/source/blender/freestyle/src/scene_graph/TriangleRep.h b/source/blender/freestyle/intern/scene_graph/TriangleRep.h
index 20df12cfd8f..20df12cfd8f 100755
--- a/source/blender/freestyle/src/scene_graph/TriangleRep.h
+++ b/source/blender/freestyle/intern/scene_graph/TriangleRep.h
diff --git a/source/blender/freestyle/src/scene_graph/VertexRep.cpp b/source/blender/freestyle/intern/scene_graph/VertexRep.cpp
index 1ecb5f141e1..1ecb5f141e1 100755
--- a/source/blender/freestyle/src/scene_graph/VertexRep.cpp
+++ b/source/blender/freestyle/intern/scene_graph/VertexRep.cpp
diff --git a/source/blender/freestyle/src/scene_graph/VertexRep.h b/source/blender/freestyle/intern/scene_graph/VertexRep.h
index 9dce7fbbe9c..9dce7fbbe9c 100755
--- a/source/blender/freestyle/src/scene_graph/VertexRep.h
+++ b/source/blender/freestyle/intern/scene_graph/VertexRep.h
diff --git a/source/blender/freestyle/src/scene_graph/scene_graph.pro b/source/blender/freestyle/intern/scene_graph/scene_graph.pro
index 5736104a597..5736104a597 100755
--- a/source/blender/freestyle/src/scene_graph/scene_graph.pro
+++ b/source/blender/freestyle/intern/scene_graph/scene_graph.pro
diff --git a/source/blender/freestyle/src/scene_graph/src.pri b/source/blender/freestyle/intern/scene_graph/src.pri
index 994db200812..994db200812 100755
--- a/source/blender/freestyle/src/scene_graph/src.pri
+++ b/source/blender/freestyle/intern/scene_graph/src.pri
diff --git a/source/blender/freestyle/src/stroke/AdvancedFunctions0D.cpp b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.cpp
index c22e183eccb..c22e183eccb 100755
--- a/source/blender/freestyle/src/stroke/AdvancedFunctions0D.cpp
+++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.cpp
diff --git a/source/blender/freestyle/src/stroke/AdvancedFunctions0D.h b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h
index d92575cf110..d92575cf110 100755
--- a/source/blender/freestyle/src/stroke/AdvancedFunctions0D.h
+++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions0D.h
diff --git a/source/blender/freestyle/src/stroke/AdvancedFunctions1D.cpp b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp
index cf2982606e0..cf2982606e0 100755
--- a/source/blender/freestyle/src/stroke/AdvancedFunctions1D.cpp
+++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.cpp
diff --git a/source/blender/freestyle/src/stroke/AdvancedFunctions1D.h b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
index 65b0eec36fd..65b0eec36fd 100755
--- a/source/blender/freestyle/src/stroke/AdvancedFunctions1D.h
+++ b/source/blender/freestyle/intern/stroke/AdvancedFunctions1D.h
diff --git a/source/blender/freestyle/src/stroke/AdvancedPredicates1D.h b/source/blender/freestyle/intern/stroke/AdvancedPredicates1D.h
index f348f8593e5..f348f8593e5 100755
--- a/source/blender/freestyle/src/stroke/AdvancedPredicates1D.h
+++ b/source/blender/freestyle/intern/stroke/AdvancedPredicates1D.h
diff --git a/source/blender/freestyle/src/stroke/AdvancedStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
index b1c5317c5f1..b1c5317c5f1 100755
--- a/source/blender/freestyle/src/stroke/AdvancedStrokeShaders.cpp
+++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.cpp
diff --git a/source/blender/freestyle/src/stroke/AdvancedStrokeShaders.h b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h
index b624ccd3e6b..b624ccd3e6b 100755
--- a/source/blender/freestyle/src/stroke/AdvancedStrokeShaders.h
+++ b/source/blender/freestyle/intern/stroke/AdvancedStrokeShaders.h
diff --git a/source/blender/freestyle/src/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
index c3827ae3e36..c3827ae3e36 100755
--- a/source/blender/freestyle/src/stroke/BasicStrokeShaders.cpp
+++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
diff --git a/source/blender/freestyle/src/stroke/BasicStrokeShaders.h b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
index f68971a3966..f68971a3966 100755
--- a/source/blender/freestyle/src/stroke/BasicStrokeShaders.h
+++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.h
diff --git a/source/blender/freestyle/src/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp
index ecb76c4a015..ecb76c4a015 100755
--- a/source/blender/freestyle/src/stroke/Canvas.cpp
+++ b/source/blender/freestyle/intern/stroke/Canvas.cpp
diff --git a/source/blender/freestyle/src/stroke/Canvas.h b/source/blender/freestyle/intern/stroke/Canvas.h
index cae50162933..cae50162933 100755
--- a/source/blender/freestyle/src/stroke/Canvas.h
+++ b/source/blender/freestyle/intern/stroke/Canvas.h
diff --git a/source/blender/freestyle/src/stroke/Chain.cpp b/source/blender/freestyle/intern/stroke/Chain.cpp
index 3776cd58a03..3776cd58a03 100755
--- a/source/blender/freestyle/src/stroke/Chain.cpp
+++ b/source/blender/freestyle/intern/stroke/Chain.cpp
diff --git a/source/blender/freestyle/src/stroke/Chain.h b/source/blender/freestyle/intern/stroke/Chain.h
index 042437a4154..042437a4154 100755
--- a/source/blender/freestyle/src/stroke/Chain.h
+++ b/source/blender/freestyle/intern/stroke/Chain.h
diff --git a/source/blender/freestyle/src/stroke/ChainingIterators.cpp b/source/blender/freestyle/intern/stroke/ChainingIterators.cpp
index 206b6eb7364..206b6eb7364 100755
--- a/source/blender/freestyle/src/stroke/ChainingIterators.cpp
+++ b/source/blender/freestyle/intern/stroke/ChainingIterators.cpp
diff --git a/source/blender/freestyle/src/stroke/ChainingIterators.h b/source/blender/freestyle/intern/stroke/ChainingIterators.h
index 1e946855dce..1e946855dce 100755
--- a/source/blender/freestyle/src/stroke/ChainingIterators.h
+++ b/source/blender/freestyle/intern/stroke/ChainingIterators.h
diff --git a/source/blender/freestyle/src/stroke/ContextFunctions.cpp b/source/blender/freestyle/intern/stroke/ContextFunctions.cpp
index b55da1fb0f8..b55da1fb0f8 100755
--- a/source/blender/freestyle/src/stroke/ContextFunctions.cpp
+++ b/source/blender/freestyle/intern/stroke/ContextFunctions.cpp
diff --git a/source/blender/freestyle/src/stroke/ContextFunctions.h b/source/blender/freestyle/intern/stroke/ContextFunctions.h
index 37c98656fa7..37c98656fa7 100755
--- a/source/blender/freestyle/src/stroke/ContextFunctions.h
+++ b/source/blender/freestyle/intern/stroke/ContextFunctions.h
diff --git a/source/blender/freestyle/src/stroke/Curve.cpp b/source/blender/freestyle/intern/stroke/Curve.cpp
index f7b255c3ef4..f7b255c3ef4 100755
--- a/source/blender/freestyle/src/stroke/Curve.cpp
+++ b/source/blender/freestyle/intern/stroke/Curve.cpp
diff --git a/source/blender/freestyle/src/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h
index 400f27e5d5a..400f27e5d5a 100755
--- a/source/blender/freestyle/src/stroke/Curve.h
+++ b/source/blender/freestyle/intern/stroke/Curve.h
diff --git a/source/blender/freestyle/src/stroke/CurveAdvancedIterators.h b/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h
index dfc9f2719f8..dfc9f2719f8 100755
--- a/source/blender/freestyle/src/stroke/CurveAdvancedIterators.h
+++ b/source/blender/freestyle/intern/stroke/CurveAdvancedIterators.h
diff --git a/source/blender/freestyle/src/stroke/CurveIterators.h b/source/blender/freestyle/intern/stroke/CurveIterators.h
index 92f8bf065f4..92f8bf065f4 100755
--- a/source/blender/freestyle/src/stroke/CurveIterators.h
+++ b/source/blender/freestyle/intern/stroke/CurveIterators.h
diff --git a/source/blender/freestyle/src/stroke/Modifiers.h b/source/blender/freestyle/intern/stroke/Modifiers.h
index c3be65ffc89..c3be65ffc89 100755
--- a/source/blender/freestyle/src/stroke/Modifiers.h
+++ b/source/blender/freestyle/intern/stroke/Modifiers.h
diff --git a/source/blender/freestyle/src/stroke/Module.h b/source/blender/freestyle/intern/stroke/Module.h
index 591bb157392..591bb157392 100755
--- a/source/blender/freestyle/src/stroke/Module.h
+++ b/source/blender/freestyle/intern/stroke/Module.h
diff --git a/source/blender/freestyle/src/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp
index 121dee3ba26..121dee3ba26 100755
--- a/source/blender/freestyle/src/stroke/Operators.cpp
+++ b/source/blender/freestyle/intern/stroke/Operators.cpp
diff --git a/source/blender/freestyle/src/stroke/Operators.h b/source/blender/freestyle/intern/stroke/Operators.h
index 96ecd0aa75b..96ecd0aa75b 100755
--- a/source/blender/freestyle/src/stroke/Operators.h
+++ b/source/blender/freestyle/intern/stroke/Operators.h
diff --git a/source/blender/freestyle/src/stroke/PSStrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp
index dc9c94e0e11..dc9c94e0e11 100755
--- a/source/blender/freestyle/src/stroke/PSStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.cpp
diff --git a/source/blender/freestyle/src/stroke/PSStrokeRenderer.h b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h
index 821c016ab91..821c016ab91 100755
--- a/source/blender/freestyle/src/stroke/PSStrokeRenderer.h
+++ b/source/blender/freestyle/intern/stroke/PSStrokeRenderer.h
diff --git a/source/blender/freestyle/src/stroke/Predicates0D.h b/source/blender/freestyle/intern/stroke/Predicates0D.h
index 4c2dfacdf98..4c2dfacdf98 100755
--- a/source/blender/freestyle/src/stroke/Predicates0D.h
+++ b/source/blender/freestyle/intern/stroke/Predicates0D.h
diff --git a/source/blender/freestyle/src/stroke/Predicates1D.h b/source/blender/freestyle/intern/stroke/Predicates1D.h
index cf9a3283ae4..cf9a3283ae4 100755
--- a/source/blender/freestyle/src/stroke/Predicates1D.h
+++ b/source/blender/freestyle/intern/stroke/Predicates1D.h
diff --git a/source/blender/freestyle/src/stroke/QInformationMap.h b/source/blender/freestyle/intern/stroke/QInformationMap.h
index 2542bdba147..2542bdba147 100755
--- a/source/blender/freestyle/src/stroke/QInformationMap.h
+++ b/source/blender/freestyle/intern/stroke/QInformationMap.h
diff --git a/source/blender/freestyle/src/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp
index d6ff4d255c4..d6ff4d255c4 100755
--- a/source/blender/freestyle/src/stroke/Stroke.cpp
+++ b/source/blender/freestyle/intern/stroke/Stroke.cpp
diff --git a/source/blender/freestyle/src/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h
index a5cf51f8224..a5cf51f8224 100755
--- a/source/blender/freestyle/src/stroke/Stroke.h
+++ b/source/blender/freestyle/intern/stroke/Stroke.h
diff --git a/source/blender/freestyle/src/stroke/StrokeAdvancedIterators.h b/source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h
index 279a0b12089..279a0b12089 100755
--- a/source/blender/freestyle/src/stroke/StrokeAdvancedIterators.h
+++ b/source/blender/freestyle/intern/stroke/StrokeAdvancedIterators.h
diff --git a/source/blender/freestyle/src/stroke/StrokeIO.cpp b/source/blender/freestyle/intern/stroke/StrokeIO.cpp
index 7f540939fa1..7f540939fa1 100755
--- a/source/blender/freestyle/src/stroke/StrokeIO.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeIO.cpp
diff --git a/source/blender/freestyle/src/stroke/StrokeIO.h b/source/blender/freestyle/intern/stroke/StrokeIO.h
index 42b99420f4a..42b99420f4a 100755
--- a/source/blender/freestyle/src/stroke/StrokeIO.h
+++ b/source/blender/freestyle/intern/stroke/StrokeIO.h
diff --git a/source/blender/freestyle/src/stroke/StrokeIterators.h b/source/blender/freestyle/intern/stroke/StrokeIterators.h
index 9cc08a0532a..9cc08a0532a 100755
--- a/source/blender/freestyle/src/stroke/StrokeIterators.h
+++ b/source/blender/freestyle/intern/stroke/StrokeIterators.h
diff --git a/source/blender/freestyle/src/stroke/StrokeLayer.cpp b/source/blender/freestyle/intern/stroke/StrokeLayer.cpp
index 8b469399ca8..8b469399ca8 100755
--- a/source/blender/freestyle/src/stroke/StrokeLayer.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeLayer.cpp
diff --git a/source/blender/freestyle/src/stroke/StrokeLayer.h b/source/blender/freestyle/intern/stroke/StrokeLayer.h
index b89b77a85a7..b89b77a85a7 100755
--- a/source/blender/freestyle/src/stroke/StrokeLayer.h
+++ b/source/blender/freestyle/intern/stroke/StrokeLayer.h
diff --git a/source/blender/freestyle/src/stroke/StrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp
index e747fb4f5cd..e747fb4f5cd 100755
--- a/source/blender/freestyle/src/stroke/StrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.cpp
diff --git a/source/blender/freestyle/src/stroke/StrokeRenderer.h b/source/blender/freestyle/intern/stroke/StrokeRenderer.h
index d192fe30145..d192fe30145 100755
--- a/source/blender/freestyle/src/stroke/StrokeRenderer.h
+++ b/source/blender/freestyle/intern/stroke/StrokeRenderer.h
diff --git a/source/blender/freestyle/src/stroke/StrokeRep.cpp b/source/blender/freestyle/intern/stroke/StrokeRep.cpp
index 055e1fb1be4..055e1fb1be4 100755
--- a/source/blender/freestyle/src/stroke/StrokeRep.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp
diff --git a/source/blender/freestyle/src/stroke/StrokeRep.h b/source/blender/freestyle/intern/stroke/StrokeRep.h
index 129769e5489..129769e5489 100755
--- a/source/blender/freestyle/src/stroke/StrokeRep.h
+++ b/source/blender/freestyle/intern/stroke/StrokeRep.h
diff --git a/source/blender/freestyle/src/stroke/StrokeShader.h b/source/blender/freestyle/intern/stroke/StrokeShader.h
index fa1289f6e0f..fa1289f6e0f 100755
--- a/source/blender/freestyle/src/stroke/StrokeShader.h
+++ b/source/blender/freestyle/intern/stroke/StrokeShader.h
diff --git a/source/blender/freestyle/src/stroke/StrokeTesselator.cpp b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
index 6d0f5aa847c..6d0f5aa847c 100755
--- a/source/blender/freestyle/src/stroke/StrokeTesselator.cpp
+++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.cpp
diff --git a/source/blender/freestyle/src/stroke/StrokeTesselator.h b/source/blender/freestyle/intern/stroke/StrokeTesselator.h
index 767d82d3d98..767d82d3d98 100755
--- a/source/blender/freestyle/src/stroke/StrokeTesselator.h
+++ b/source/blender/freestyle/intern/stroke/StrokeTesselator.h
diff --git a/source/blender/freestyle/src/stroke/StyleModule.h b/source/blender/freestyle/intern/stroke/StyleModule.h
index 3d39e53515b..3d39e53515b 100755
--- a/source/blender/freestyle/src/stroke/StyleModule.h
+++ b/source/blender/freestyle/intern/stroke/StyleModule.h
diff --git a/source/blender/freestyle/src/stroke/TextStrokeRenderer.cpp b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp
index ea5af287bbe..ea5af287bbe 100755
--- a/source/blender/freestyle/src/stroke/TextStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp
diff --git a/source/blender/freestyle/src/stroke/TextStrokeRenderer.h b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
index ef610d63bdd..ef610d63bdd 100755
--- a/source/blender/freestyle/src/stroke/TextStrokeRenderer.h
+++ b/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
diff --git a/source/blender/freestyle/src/stroke/src.pri b/source/blender/freestyle/intern/stroke/src.pri
index 09707f86dbc..09707f86dbc 100755
--- a/source/blender/freestyle/src/stroke/src.pri
+++ b/source/blender/freestyle/intern/stroke/src.pri
diff --git a/source/blender/freestyle/src/stroke/stroke.pro b/source/blender/freestyle/intern/stroke/stroke.pro
index 90c0cc96592..90c0cc96592 100755
--- a/source/blender/freestyle/src/stroke/stroke.pro
+++ b/source/blender/freestyle/intern/stroke/stroke.pro
diff --git a/source/blender/freestyle/src/swig/Freestyle.i b/source/blender/freestyle/intern/swig/Freestyle.i
index 37daddc4e11..37daddc4e11 100755
--- a/source/blender/freestyle/src/swig/Freestyle.i
+++ b/source/blender/freestyle/intern/swig/Freestyle.i
diff --git a/source/blender/freestyle/src/swig/FreestyleWrapper.vc7.vcproj b/source/blender/freestyle/intern/swig/FreestyleWrapper.vc7.vcproj
index 060c1987ea1..060c1987ea1 100755
--- a/source/blender/freestyle/src/swig/FreestyleWrapper.vc7.vcproj
+++ b/source/blender/freestyle/intern/swig/FreestyleWrapper.vc7.vcproj
diff --git a/source/blender/freestyle/src/swig/FreestyleWrapper.vc8.vcproj b/source/blender/freestyle/intern/swig/FreestyleWrapper.vc8.vcproj
index 833a4f89aca..833a4f89aca 100755
--- a/source/blender/freestyle/src/swig/FreestyleWrapper.vc8.vcproj
+++ b/source/blender/freestyle/intern/swig/FreestyleWrapper.vc8.vcproj
diff --git a/source/blender/freestyle/src/swig/Makefile b/source/blender/freestyle/intern/swig/Makefile
index 01829434be0..01829434be0 100755
--- a/source/blender/freestyle/src/swig/Makefile
+++ b/source/blender/freestyle/intern/swig/Makefile
diff --git a/source/blender/freestyle/src/swig/Makefile.cygwin b/source/blender/freestyle/intern/swig/Makefile.cygwin
index 1f5b3ce2a79..1f5b3ce2a79 100755
--- a/source/blender/freestyle/src/swig/Makefile.cygwin
+++ b/source/blender/freestyle/intern/swig/Makefile.cygwin
diff --git a/source/blender/freestyle/src/swig/Makefile.linux b/source/blender/freestyle/intern/swig/Makefile.linux
index 2a93971ccd5..2a93971ccd5 100755
--- a/source/blender/freestyle/src/swig/Makefile.linux
+++ b/source/blender/freestyle/intern/swig/Makefile.linux
diff --git a/source/blender/freestyle/src/swig/Makefile.mac b/source/blender/freestyle/intern/swig/Makefile.mac
index 2c46d74549e..2c46d74549e 100644
--- a/source/blender/freestyle/src/swig/Makefile.mac
+++ b/source/blender/freestyle/intern/swig/Makefile.mac
diff --git a/source/blender/freestyle/src/swig/Makefile.noswig b/source/blender/freestyle/intern/swig/Makefile.noswig
index 368c4fb173b..368c4fb173b 100755
--- a/source/blender/freestyle/src/swig/Makefile.noswig
+++ b/source/blender/freestyle/intern/swig/Makefile.noswig
diff --git a/source/blender/freestyle/src/swig/ModuleWrapper.cpp b/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
index 36bd39b2b15..36bd39b2b15 100755
--- a/source/blender/freestyle/src/swig/ModuleWrapper.cpp
+++ b/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
diff --git a/source/blender/freestyle/src/swig/ModuleWrapper.h b/source/blender/freestyle/intern/swig/ModuleWrapper.h
index 06ca8c90f37..06ca8c90f37 100755
--- a/source/blender/freestyle/src/swig/ModuleWrapper.h
+++ b/source/blender/freestyle/intern/swig/ModuleWrapper.h
diff --git a/source/blender/freestyle/src/system/BaseIterator.h b/source/blender/freestyle/intern/system/BaseIterator.h
index 45cc19df4fe..45cc19df4fe 100755
--- a/source/blender/freestyle/src/system/BaseIterator.h
+++ b/source/blender/freestyle/intern/system/BaseIterator.h
diff --git a/source/blender/freestyle/src/system/BaseObject.cpp b/source/blender/freestyle/intern/system/BaseObject.cpp
index 21d8a77b268..21d8a77b268 100755
--- a/source/blender/freestyle/src/system/BaseObject.cpp
+++ b/source/blender/freestyle/intern/system/BaseObject.cpp
diff --git a/source/blender/freestyle/src/system/BaseObject.h b/source/blender/freestyle/intern/system/BaseObject.h
index a8515f98385..a8515f98385 100755
--- a/source/blender/freestyle/src/system/BaseObject.h
+++ b/source/blender/freestyle/intern/system/BaseObject.h
diff --git a/source/blender/freestyle/src/system/Cast.h b/source/blender/freestyle/intern/system/Cast.h
index 15af767443e..15af767443e 100755
--- a/source/blender/freestyle/src/system/Cast.h
+++ b/source/blender/freestyle/intern/system/Cast.h
diff --git a/source/blender/freestyle/src/system/Exception.cpp b/source/blender/freestyle/intern/system/Exception.cpp
index d1d12d18297..d1d12d18297 100755
--- a/source/blender/freestyle/src/system/Exception.cpp
+++ b/source/blender/freestyle/intern/system/Exception.cpp
diff --git a/source/blender/freestyle/src/system/Exception.h b/source/blender/freestyle/intern/system/Exception.h
index 378de6b558f..378de6b558f 100755
--- a/source/blender/freestyle/src/system/Exception.h
+++ b/source/blender/freestyle/intern/system/Exception.h
diff --git a/source/blender/freestyle/src/system/FreestyleConfig.h b/source/blender/freestyle/intern/system/FreestyleConfig.h
index 45bd00a402e..45bd00a402e 100755
--- a/source/blender/freestyle/src/system/FreestyleConfig.h
+++ b/source/blender/freestyle/intern/system/FreestyleConfig.h
diff --git a/source/blender/freestyle/src/system/Id.h b/source/blender/freestyle/intern/system/Id.h
index 1f2206ed337..1f2206ed337 100755
--- a/source/blender/freestyle/src/system/Id.h
+++ b/source/blender/freestyle/intern/system/Id.h
diff --git a/source/blender/freestyle/src/system/Interpreter.h b/source/blender/freestyle/intern/system/Interpreter.h
index ce603b17238..ce603b17238 100755
--- a/source/blender/freestyle/src/system/Interpreter.h
+++ b/source/blender/freestyle/intern/system/Interpreter.h
diff --git a/source/blender/freestyle/src/system/Precision.h b/source/blender/freestyle/intern/system/Precision.h
index 24327a280df..24327a280df 100755
--- a/source/blender/freestyle/src/system/Precision.h
+++ b/source/blender/freestyle/intern/system/Precision.h
diff --git a/source/blender/freestyle/src/system/ProgressBar.h b/source/blender/freestyle/intern/system/ProgressBar.h
index 5b61f936c90..5b61f936c90 100755
--- a/source/blender/freestyle/src/system/ProgressBar.h
+++ b/source/blender/freestyle/intern/system/ProgressBar.h
diff --git a/source/blender/freestyle/src/system/PseudoNoise.cpp b/source/blender/freestyle/intern/system/PseudoNoise.cpp
index 59332229ae2..59332229ae2 100755
--- a/source/blender/freestyle/src/system/PseudoNoise.cpp
+++ b/source/blender/freestyle/intern/system/PseudoNoise.cpp
diff --git a/source/blender/freestyle/src/system/PseudoNoise.h b/source/blender/freestyle/intern/system/PseudoNoise.h
index 43143865600..43143865600 100755
--- a/source/blender/freestyle/src/system/PseudoNoise.h
+++ b/source/blender/freestyle/intern/system/PseudoNoise.h
diff --git a/source/blender/freestyle/src/system/PythonInterpreter.cpp b/source/blender/freestyle/intern/system/PythonInterpreter.cpp
index 821bd32b40b..821bd32b40b 100755
--- a/source/blender/freestyle/src/system/PythonInterpreter.cpp
+++ b/source/blender/freestyle/intern/system/PythonInterpreter.cpp
diff --git a/source/blender/freestyle/src/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h
index f9a573ffb86..f9a573ffb86 100755
--- a/source/blender/freestyle/src/system/PythonInterpreter.h
+++ b/source/blender/freestyle/intern/system/PythonInterpreter.h
diff --git a/source/blender/freestyle/src/system/RandGen.cpp b/source/blender/freestyle/intern/system/RandGen.cpp
index a328cb7f583..a328cb7f583 100755
--- a/source/blender/freestyle/src/system/RandGen.cpp
+++ b/source/blender/freestyle/intern/system/RandGen.cpp
diff --git a/source/blender/freestyle/src/system/RandGen.h b/source/blender/freestyle/intern/system/RandGen.h
index 409d3b79609..409d3b79609 100755
--- a/source/blender/freestyle/src/system/RandGen.h
+++ b/source/blender/freestyle/intern/system/RandGen.h
diff --git a/source/blender/freestyle/src/system/StringUtils.cpp b/source/blender/freestyle/intern/system/StringUtils.cpp
index 2af76feeb37..2af76feeb37 100755
--- a/source/blender/freestyle/src/system/StringUtils.cpp
+++ b/source/blender/freestyle/intern/system/StringUtils.cpp
diff --git a/source/blender/freestyle/src/system/StringUtils.h b/source/blender/freestyle/intern/system/StringUtils.h
index 44adfc2b044..44adfc2b044 100755
--- a/source/blender/freestyle/src/system/StringUtils.h
+++ b/source/blender/freestyle/intern/system/StringUtils.h
diff --git a/source/blender/freestyle/src/system/TimeStamp.cpp b/source/blender/freestyle/intern/system/TimeStamp.cpp
index c66e1131611..c66e1131611 100755
--- a/source/blender/freestyle/src/system/TimeStamp.cpp
+++ b/source/blender/freestyle/intern/system/TimeStamp.cpp
diff --git a/source/blender/freestyle/src/system/TimeStamp.h b/source/blender/freestyle/intern/system/TimeStamp.h
index 568a7851e30..568a7851e30 100755
--- a/source/blender/freestyle/src/system/TimeStamp.h
+++ b/source/blender/freestyle/intern/system/TimeStamp.h
diff --git a/source/blender/freestyle/src/system/TimeUtils.h b/source/blender/freestyle/intern/system/TimeUtils.h
index 99dd5b0a669..99dd5b0a669 100755
--- a/source/blender/freestyle/src/system/TimeUtils.h
+++ b/source/blender/freestyle/intern/system/TimeUtils.h
diff --git a/source/blender/freestyle/src/system/src.pri b/source/blender/freestyle/intern/system/src.pri
index e7d69e142b4..e7d69e142b4 100755
--- a/source/blender/freestyle/src/system/src.pri
+++ b/source/blender/freestyle/intern/system/src.pri
diff --git a/source/blender/freestyle/src/system/system.pro b/source/blender/freestyle/intern/system/system.pro
index 495cdf47105..495cdf47105 100755
--- a/source/blender/freestyle/src/system/system.pro
+++ b/source/blender/freestyle/intern/system/system.pro
diff --git a/source/blender/freestyle/src/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
index 628b3ad77aa..628b3ad77aa 100755
--- a/source/blender/freestyle/src/view_map/FEdgeXDetector.cpp
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp
diff --git a/source/blender/freestyle/src/view_map/FEdgeXDetector.h b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
index 38d0f34e21f..38d0f34e21f 100755
--- a/source/blender/freestyle/src/view_map/FEdgeXDetector.h
+++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
diff --git a/source/blender/freestyle/src/view_map/Functions0D.cpp b/source/blender/freestyle/intern/view_map/Functions0D.cpp
index c868510624c..c868510624c 100755
--- a/source/blender/freestyle/src/view_map/Functions0D.cpp
+++ b/source/blender/freestyle/intern/view_map/Functions0D.cpp
diff --git a/source/blender/freestyle/src/view_map/Functions0D.h b/source/blender/freestyle/intern/view_map/Functions0D.h
index 3160546da2f..3160546da2f 100755
--- a/source/blender/freestyle/src/view_map/Functions0D.h
+++ b/source/blender/freestyle/intern/view_map/Functions0D.h
diff --git a/source/blender/freestyle/src/view_map/Functions1D.cpp b/source/blender/freestyle/intern/view_map/Functions1D.cpp
index a34124ded31..a34124ded31 100755
--- a/source/blender/freestyle/src/view_map/Functions1D.cpp
+++ b/source/blender/freestyle/intern/view_map/Functions1D.cpp
diff --git a/source/blender/freestyle/src/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h
index c92d12ff330..c92d12ff330 100755
--- a/source/blender/freestyle/src/view_map/Functions1D.h
+++ b/source/blender/freestyle/intern/view_map/Functions1D.h
diff --git a/source/blender/freestyle/src/view_map/Interface0D.h b/source/blender/freestyle/intern/view_map/Interface0D.h
index eec39d2f7bc..eec39d2f7bc 100755
--- a/source/blender/freestyle/src/view_map/Interface0D.h
+++ b/source/blender/freestyle/intern/view_map/Interface0D.h
diff --git a/source/blender/freestyle/src/view_map/Interface1D.h b/source/blender/freestyle/intern/view_map/Interface1D.h
index 812187e5ec1..812187e5ec1 100755
--- a/source/blender/freestyle/src/view_map/Interface1D.h
+++ b/source/blender/freestyle/intern/view_map/Interface1D.h
diff --git a/source/blender/freestyle/src/view_map/Silhouette.cpp b/source/blender/freestyle/intern/view_map/Silhouette.cpp
index db4f82d369e..db4f82d369e 100755
--- a/source/blender/freestyle/src/view_map/Silhouette.cpp
+++ b/source/blender/freestyle/intern/view_map/Silhouette.cpp
diff --git a/source/blender/freestyle/src/view_map/Silhouette.h b/source/blender/freestyle/intern/view_map/Silhouette.h
index e88bf23b210..e88bf23b210 100755
--- a/source/blender/freestyle/src/view_map/Silhouette.h
+++ b/source/blender/freestyle/intern/view_map/Silhouette.h
diff --git a/source/blender/freestyle/src/view_map/SilhouetteGeomEngine.cpp b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
index 19b8a632ffe..19b8a632ffe 100755
--- a/source/blender/freestyle/src/view_map/SilhouetteGeomEngine.cpp
+++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp
diff --git a/source/blender/freestyle/src/view_map/SilhouetteGeomEngine.h b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h
index 159dda1afc0..159dda1afc0 100755
--- a/source/blender/freestyle/src/view_map/SilhouetteGeomEngine.h
+++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.h
diff --git a/source/blender/freestyle/src/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
index b2604606aa7..b2604606aa7 100755
--- a/source/blender/freestyle/src/view_map/SteerableViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
diff --git a/source/blender/freestyle/src/view_map/SteerableViewMap.h b/source/blender/freestyle/intern/view_map/SteerableViewMap.h
index fe7c2493752..fe7c2493752 100755
--- a/source/blender/freestyle/src/view_map/SteerableViewMap.h
+++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.h
diff --git a/source/blender/freestyle/src/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
index 20b3aeb144d..20b3aeb144d 100755
--- a/source/blender/freestyle/src/view_map/ViewEdgeXBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp
diff --git a/source/blender/freestyle/src/view_map/ViewEdgeXBuilder.h b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
index 9e2837b49a7..9e2837b49a7 100755
--- a/source/blender/freestyle/src/view_map/ViewEdgeXBuilder.h
+++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
diff --git a/source/blender/freestyle/src/view_map/ViewMap.cpp b/source/blender/freestyle/intern/view_map/ViewMap.cpp
index 9a2d262b703..9a2d262b703 100755
--- a/source/blender/freestyle/src/view_map/ViewMap.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMap.cpp
diff --git a/source/blender/freestyle/src/view_map/ViewMap.h b/source/blender/freestyle/intern/view_map/ViewMap.h
index bdbb140e130..bdbb140e130 100755
--- a/source/blender/freestyle/src/view_map/ViewMap.h
+++ b/source/blender/freestyle/intern/view_map/ViewMap.h
diff --git a/source/blender/freestyle/src/view_map/ViewMapAdvancedIterators.h b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
index bb2d916f2df..bb2d916f2df 100755
--- a/source/blender/freestyle/src/view_map/ViewMapAdvancedIterators.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.h
diff --git a/source/blender/freestyle/src/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
index 32f5283a63c..32f5283a63c 100755
--- a/source/blender/freestyle/src/view_map/ViewMapBuilder.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
diff --git a/source/blender/freestyle/src/view_map/ViewMapBuilder.h b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
index ec52d4fdd7e..ec52d4fdd7e 100755
--- a/source/blender/freestyle/src/view_map/ViewMapBuilder.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
diff --git a/source/blender/freestyle/src/view_map/ViewMapIO.cpp b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
index d68164973a1..d68164973a1 100755
--- a/source/blender/freestyle/src/view_map/ViewMapIO.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
diff --git a/source/blender/freestyle/src/view_map/ViewMapIO.h b/source/blender/freestyle/intern/view_map/ViewMapIO.h
index 33e168b537b..33e168b537b 100755
--- a/source/blender/freestyle/src/view_map/ViewMapIO.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapIO.h
diff --git a/source/blender/freestyle/src/view_map/ViewMapIterators.h b/source/blender/freestyle/intern/view_map/ViewMapIterators.h
index 004674ba758..004674ba758 100755
--- a/source/blender/freestyle/src/view_map/ViewMapIterators.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapIterators.h
diff --git a/source/blender/freestyle/src/view_map/ViewMapTesselator.cpp b/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp
index 6041f527d17..6041f527d17 100755
--- a/source/blender/freestyle/src/view_map/ViewMapTesselator.cpp
+++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.cpp
diff --git a/source/blender/freestyle/src/view_map/ViewMapTesselator.h b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
index fc1ec8e373e..fc1ec8e373e 100755
--- a/source/blender/freestyle/src/view_map/ViewMapTesselator.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
diff --git a/source/blender/freestyle/src/view_map/src.pri b/source/blender/freestyle/intern/view_map/src.pri
index 2faf6a81fea..2faf6a81fea 100755
--- a/source/blender/freestyle/src/view_map/src.pri
+++ b/source/blender/freestyle/intern/view_map/src.pri
diff --git a/source/blender/freestyle/src/view_map/view_map.pro b/source/blender/freestyle/intern/view_map/view_map.pro
index ef629bcf6a7..ef629bcf6a7 100755
--- a/source/blender/freestyle/src/view_map/view_map.pro
+++ b/source/blender/freestyle/intern/view_map/view_map.pro
diff --git a/source/blender/freestyle/src/winged_edge/Curvature.cpp b/source/blender/freestyle/intern/winged_edge/Curvature.cpp
index a890fb92c04..a890fb92c04 100755
--- a/source/blender/freestyle/src/winged_edge/Curvature.cpp
+++ b/source/blender/freestyle/intern/winged_edge/Curvature.cpp
diff --git a/source/blender/freestyle/src/winged_edge/Curvature.h b/source/blender/freestyle/intern/winged_edge/Curvature.h
index 214a32ca922..214a32ca922 100755
--- a/source/blender/freestyle/src/winged_edge/Curvature.h
+++ b/source/blender/freestyle/intern/winged_edge/Curvature.h
diff --git a/source/blender/freestyle/src/winged_edge/Nature.h b/source/blender/freestyle/intern/winged_edge/Nature.h
index 1f165e677f5..1f165e677f5 100755
--- a/source/blender/freestyle/src/winged_edge/Nature.h
+++ b/source/blender/freestyle/intern/winged_edge/Nature.h
diff --git a/source/blender/freestyle/src/winged_edge/WEdge.cpp b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
index 79b3a8dae26..79b3a8dae26 100755
--- a/source/blender/freestyle/src/winged_edge/WEdge.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.cpp
diff --git a/source/blender/freestyle/src/winged_edge/WEdge.h b/source/blender/freestyle/intern/winged_edge/WEdge.h
index 2369caf4566..2369caf4566 100755
--- a/source/blender/freestyle/src/winged_edge/WEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WEdge.h
diff --git a/source/blender/freestyle/src/winged_edge/WFillGrid.cpp b/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp
index 7d0a2d3c561..7d0a2d3c561 100755
--- a/source/blender/freestyle/src/winged_edge/WFillGrid.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WFillGrid.cpp
diff --git a/source/blender/freestyle/src/winged_edge/WFillGrid.h b/source/blender/freestyle/intern/winged_edge/WFillGrid.h
index 2ebbc2f359a..2ebbc2f359a 100755
--- a/source/blender/freestyle/src/winged_edge/WFillGrid.h
+++ b/source/blender/freestyle/intern/winged_edge/WFillGrid.h
diff --git a/source/blender/freestyle/src/winged_edge/WSFillGrid.cpp b/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp
index cf3734b488e..cf3734b488e 100755
--- a/source/blender/freestyle/src/winged_edge/WSFillGrid.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.cpp
diff --git a/source/blender/freestyle/src/winged_edge/WSFillGrid.h b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
index 976fdca8e46..976fdca8e46 100755
--- a/source/blender/freestyle/src/winged_edge/WSFillGrid.h
+++ b/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
diff --git a/source/blender/freestyle/src/winged_edge/WXEdge.cpp b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp
index 115a4f61789..115a4f61789 100755
--- a/source/blender/freestyle/src/winged_edge/WXEdge.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp
diff --git a/source/blender/freestyle/src/winged_edge/WXEdge.h b/source/blender/freestyle/intern/winged_edge/WXEdge.h
index beacb1a9ca9..beacb1a9ca9 100755
--- a/source/blender/freestyle/src/winged_edge/WXEdge.h
+++ b/source/blender/freestyle/intern/winged_edge/WXEdge.h
diff --git a/source/blender/freestyle/src/winged_edge/WXEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
index 534c6e323a9..534c6e323a9 100755
--- a/source/blender/freestyle/src/winged_edge/WXEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.cpp
diff --git a/source/blender/freestyle/src/winged_edge/WXEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
index b646d66a285..b646d66a285 100755
--- a/source/blender/freestyle/src/winged_edge/WXEdgeBuilder.h
+++ b/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
diff --git a/source/blender/freestyle/src/winged_edge/WingedEdgeBuilder.cpp b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
index 98e7c269248..98e7c269248 100755
--- a/source/blender/freestyle/src/winged_edge/WingedEdgeBuilder.cpp
+++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.cpp
diff --git a/source/blender/freestyle/src/winged_edge/WingedEdgeBuilder.h b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
index fe033f2ea0b..fe033f2ea0b 100755
--- a/source/blender/freestyle/src/winged_edge/WingedEdgeBuilder.h
+++ b/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
diff --git a/source/blender/freestyle/src/winged_edge/src.pri b/source/blender/freestyle/intern/winged_edge/src.pri
index 9cf40633dcf..9cf40633dcf 100755
--- a/source/blender/freestyle/src/winged_edge/src.pri
+++ b/source/blender/freestyle/intern/winged_edge/src.pri
diff --git a/source/blender/freestyle/src/winged_edge/winged_edge.pro b/source/blender/freestyle/intern/winged_edge/winged_edge.pro
index e36d69454b6..e36d69454b6 100755
--- a/source/blender/freestyle/src/winged_edge/winged_edge.pro
+++ b/source/blender/freestyle/intern/winged_edge/winged_edge.pro