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/Predicates0D.cpp | |
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/Predicates0D.cpp')
-rw-r--r-- | source/blender/freestyle/intern/stroke/Predicates0D.cpp | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/stroke/Predicates0D.cpp b/source/blender/freestyle/intern/stroke/Predicates0D.cpp new file mode 100644 index 00000000000..f189b2e38ea --- /dev/null +++ b/source/blender/freestyle/intern/stroke/Predicates0D.cpp @@ -0,0 +1,41 @@ +/* + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +/** \file blender/freestyle/intern/stroke/Predicates0D.cpp + * \ingroup freestyle + */ + +#include "Predicates0D.h" + +#include "../python/Director.h" + +namespace Freestyle { + +int UnaryPredicate0D::operator()(Interface0DIterator& it) +{ + return Director_BPy_UnaryPredicate0D___call__(this, it); +} + +int BinaryPredicate0D::operator()(Interface0D& inter1, Interface0D& inter2) +{ + return Director_BPy_BinaryPredicate0D___call__(this, inter1, inter2); +} + +} /* namespace Freestyle */ |