diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-04-29 09:32:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-04-29 09:32:30 +0300 |
commit | 33a5248b6c82d7930089544be10480fa0a25aa80 (patch) | |
tree | 8ee84267fae97ac57bdd9d6b3c396e793d77d6fe /source/blender/freestyle | |
parent | de9e45a88bd8ceee4af1ea907bb93a3bf22024b9 (diff) | |
parent | 6d73e2d3cf3c9a8fa4c73e04d02caecfd716e962 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/freestyle')
-rw-r--r-- | source/blender/freestyle/intern/application/AppView.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source/blender/freestyle/intern/application/AppView.cpp b/source/blender/freestyle/intern/application/AppView.cpp index c331d1de9c9..9b1b02c8ee2 100644 --- a/source/blender/freestyle/intern/application/AppView.cpp +++ b/source/blender/freestyle/intern/application/AppView.cpp @@ -22,12 +22,6 @@ * \ingroup freestyle */ -/* This header file needs to be included first, in order to avoid a - compilation with MinGW (see the commit log of revision 28253) */ -extern "C" { -#include "BLI_jitter.h" -} - #include <iostream> #include "Controller.h" |