Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-04-18 14:25:44 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2010-04-18 14:25:44 +0400
commit51c8ead828d507f4a7708ebf9f02d83e92b4a369 (patch)
treef0c423c0d4a4efac777a7f6ece1d12d280f05345 /source/blender/freestyle/intern/application/AppView.cpp
parentdfe2f8dc03267e041102837e92f547fb04881510 (diff)
Fixed a compilation issue with MinGW. The commit 28081 was reverting
the workaround for name conflicts in the commit 23871 with regard to #include "BLI_jitter.h" in AppView.cpp.
Diffstat (limited to 'source/blender/freestyle/intern/application/AppView.cpp')
-rw-r--r--source/blender/freestyle/intern/application/AppView.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/application/AppView.cpp b/source/blender/freestyle/intern/application/AppView.cpp
index e523a89b445..8541122ef0d 100644
--- a/source/blender/freestyle/intern/application/AppView.cpp
+++ b/source/blender/freestyle/intern/application/AppView.cpp
@@ -19,12 +19,11 @@
//
///////////////////////////////////////////////////////////////////////////////
-#include "Controller.h"
-
extern "C" {
#include "BLI_jitter.h"
}
+#include "Controller.h"
#include <iostream>
#include "../stroke/Canvas.h"
#include "AppView.h"