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/view_map/Functions0D.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/view_map/Functions0D.h')
| -rw-r--r-- | source/blender/freestyle/intern/view_map/Functions0D.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/view_map/Functions0D.h b/source/blender/freestyle/intern/view_map/Functions0D.h index 7b90eacc218..b9b28f77636 100644 --- a/source/blender/freestyle/intern/view_map/Functions0D.h +++ b/source/blender/freestyle/intern/view_map/Functions0D.h @@ -78,7 +78,7 @@ class /*LIB_VIEW_MAP_EXPORT*/ UnaryFunction0D { public: T result; - PyObject *py_uf0D; + void *py_uf0D; /*! The type of the value returned by the functor. */ typedef T ReturnedValueType; @@ -103,6 +103,7 @@ public: * An Interface0DIterator pointing onto the point at which we wish to evaluate the function. * \return the result of the function of type T. */ + /* FIXME move the implementation to Functions0D.cpp */ virtual int operator()(Interface0DIterator& iter) { return Director_BPy_UnaryFunction0D___call__(this, py_uf0D, iter); |