From 77b37fa4615dc1e8d5656259744f0e8a1634e258 Mon Sep 17 00:00:00 2001
From: Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Date: Thu, 17 Apr 2014 12:37:08 +0900
Subject: Freestyle: Fix for VC++ warnings about 'hypot' macro redefinitions
 (Part 3).

(See commit e1771e72fbbf828dbf5bed871b814288389f3611 for more detail of
the problem).

Made changes to intern/view_map/Interface0D.h and intern/python/Director.h to
avoid #include <Python.h> and keep non-Python header files independent of it.
---
 source/blender/freestyle/intern/application/Controller.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source/blender/freestyle/intern/application')

diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp
index 81ce1622517..91a7547895f 100644
--- a/source/blender/freestyle/intern/application/Controller.cpp
+++ b/source/blender/freestyle/intern/application/Controller.cpp
@@ -22,6 +22,10 @@
  *  \ingroup freestyle
  */
 
+extern "C" {
+#include <Python.h>
+}
+
 #include <string>
 #include <fstream>
 #include <float.h>
-- 
cgit v1.2.3