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/Predicates1D.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/Predicates1D.h')
| -rw-r--r-- | source/blender/freestyle/intern/stroke/Predicates1D.h | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/source/blender/freestyle/intern/stroke/Predicates1D.h b/source/blender/freestyle/intern/stroke/Predicates1D.h index 257f938bf30..46efeae9f12 100644 --- a/source/blender/freestyle/intern/stroke/Predicates1D.h +++ b/source/blender/freestyle/intern/stroke/Predicates1D.h @@ -33,8 +33,6 @@ #include "AdvancedFunctions1D.h" -#include "../python/Director.h" - #include "../system/TimeStamp.h" #include "../view_map/Interface1D.h" @@ -61,7 +59,7 @@ class UnaryPredicate1D { public: bool result; - PyObject *py_up1D; + void *py_up1D; /*! Default constructor. */ UnaryPredicate1D() @@ -83,10 +81,7 @@ public: * The Interface1D on which we wish to evaluate the predicate. * \return true if the condition is satisfied, false otherwise. */ - virtual int operator()(Interface1D& inter) - { - return Director_BPy_UnaryPredicate1D___call__(this, inter); - } + virtual int operator()(Interface1D& inter); #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:UnaryPredicate1D") @@ -108,7 +103,7 @@ class BinaryPredicate1D { public: bool result; - PyObject *py_bp1D; + void *py_bp1D; /*! Default constructor. */ BinaryPredicate1D() @@ -133,10 +128,7 @@ public: * The second Interface1D. * \return true or false. */ - virtual int operator()(Interface1D& inter1, Interface1D& inter2) - { - return Director_BPy_BinaryPredicate1D___call__(this, inter1, inter2); - } + virtual int operator()(Interface1D& inter1, Interface1D& inter2); #ifdef WITH_CXX_GUARDEDALLOC MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BinaryPredicate1D") |