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/view_map/Functions0D.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/freestyle/intern/view_map/Functions0D.h') 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); -- cgit v1.2.3