diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-04-17 07:37:08 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-04-17 09:37:08 +0400 |
| commit | 77b37fa4615dc1e8d5656259744f0e8a1634e258 (patch) | |
| tree | 4c1e9e8580156da0a65ac4fe11dbef82f6281327 /source/blender/freestyle/intern/stroke/StrokeShader.h | |
| parent | 5d4a6a94ef40f8ae8c49d8fd8fc65384324cb03c (diff) | |
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.
Diffstat (limited to 'source/blender/freestyle/intern/stroke/StrokeShader.h')
| -rw-r--r-- | source/blender/freestyle/intern/stroke/StrokeShader.h | 13 |
1 files changed, 5 insertions, 8 deletions
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 <iostream> #include <vector> -#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<StrokeShader *>(this), ioStroke); - } + virtual int shade(Stroke& ioStroke) const; #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:StrokeShader") |