From 77b37fa4615dc1e8d5656259744f0e8a1634e258 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama 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 and keep non-Python header files independent of it. --- source/blender/freestyle/intern/stroke/StrokeShader.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'source/blender/freestyle/intern/stroke/StrokeShader.h') diff --git a/source/blender/freestyle/intern/stroke/StrokeShader.h b/source/blender/freestyle/intern/stroke/StrokeShader.h index 4657e98be61..e655b80d397 100644 --- a/source/blender/freestyle/intern/stroke/StrokeShader.h +++ b/source/blender/freestyle/intern/stroke/StrokeShader.h @@ -32,12 +32,12 @@ #include #include -#include "../python/Director.h" - #ifdef WITH_CXX_GUARDEDALLOC #include "MEM_guardedalloc.h" #endif +using namespace std; + namespace Freestyle { // @@ -72,10 +72,10 @@ class Stroke; * } * \endcode */ -class LIB_STROKE_EXPORT StrokeShader +class StrokeShader { public: - PyObject *py_ss; + void *py_ss; /*! Default constructor. */ StrokeShader() @@ -97,10 +97,7 @@ public: * The stroke we wish to shade. this Stroke is modified by the Shader (which typically * modifies the Stroke's attribute's values such as Color, Thickness, Geometry...) */ - virtual int shade(Stroke& ioStroke) const - { - return Director_BPy_StrokeShader_shade( const_cast(this), ioStroke); - } + virtual int shade(Stroke& ioStroke) const; #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeShader") -- cgit v1.2.3