From 3c7d54b38a137f5de9af716cfcc0672facf202ad Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Thu, 15 Oct 2009 19:32:07 +0000 Subject: 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. --- source/blender/freestyle/intern/application/AppView.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/freestyle') 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 #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 -- cgit v1.2.3