diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-10-15 23:32:07 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-10-15 23:32:07 +0400 |
| commit | 3c7d54b38a137f5de9af716cfcc0672facf202ad (patch) | |
| tree | 7bcbc69b9b0207a425f871bb99411b7c8abe0452 /source/blender/freestyle/intern/application/AppView.cpp | |
| parent | ee1d5b5ee6e5814cc4fdae341cb17a8a5ec8fa9f (diff) | |
Moved #include "BLI_jitter.h" to the beginning of a series of
#include statements as a workaround of symbol conflicts involving
rad1 and rad2 in the header file. As a side note, a different
solution of the issue was attempted in revision 17518 of the branch.
Diffstat (limited to 'source/blender/freestyle/intern/application/AppView.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/application/AppView.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/application/AppView.cpp b/source/blender/freestyle/intern/application/AppView.cpp index 8f918e64038..886fa31bc93 100644 --- a/source/blender/freestyle/intern/application/AppView.cpp +++ b/source/blender/freestyle/intern/application/AppView.cpp @@ -19,6 +19,10 @@ // /////////////////////////////////////////////////////////////////////////////// +extern "C" { +#include "BLI_jitter.h" +} + #include <iostream> #include "../stroke/Canvas.h" #include "AppView.h" @@ -35,7 +39,6 @@ extern "C" { #include "BLI_blenlib.h" -#include "BLI_jitter.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" #if 1 // FRS_antialiasing |