From 7378aac2cb4770fd5ebd4d4c15c7369d9a8a5f7a Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Mon, 2 Jun 2014 15:31:31 +0900 Subject: Freestyle: Minor fixes. - Fixed a typo in docstring. - Replaced int with boolean constants. - Updated lists of base classes for used-defined unary 0D/1D functions. --- .../freestyle/intern/python/Interface1D/BPy_Stroke.cpp | 6 +++--- source/blender/freestyle/intern/view_map/Functions0D.h | 12 ++++++++---- source/blender/freestyle/intern/view_map/Functions1D.h | 9 +++++---- 3 files changed, 16 insertions(+), 11 deletions(-) (limited to 'source') diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp index 80765e794fb..7110eef9036 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp @@ -245,7 +245,7 @@ PyDoc_STRVAR(Stroke_stroke_vertices_begin_doc, ".. method:: stroke_vertices_begin(t=0.0)\n" "\n" " Returns a StrokeVertexIterator pointing on the first StrokeVertex of\n" -" the Stroke. O ne can specify a sampling value to resample the Stroke\n" +" the Stroke. One can specify a sampling value to resample the Stroke\n" " on the fly if needed.\n" "\n" " :arg t: The resampling value with which we want our Stroke to be\n" @@ -262,7 +262,7 @@ static PyObject *Stroke_stroke_vertices_begin(BPy_Stroke *self, PyObject *args, if (!PyArg_ParseTupleAndKeywords(args, kwds, "|f", (char **)kwlist, &f)) return NULL; StrokeInternal::StrokeVertexIterator sv_it(self->s->strokeVerticesBegin(f)); - return BPy_StrokeVertexIterator_from_StrokeVertexIterator(sv_it, 0); + return BPy_StrokeVertexIterator_from_StrokeVertexIterator(sv_it, false); } PyDoc_STRVAR(Stroke_stroke_vertices_end_doc, @@ -277,7 +277,7 @@ PyDoc_STRVAR(Stroke_stroke_vertices_end_doc, static PyObject *Stroke_stroke_vertices_end(BPy_Stroke *self) { StrokeInternal::StrokeVertexIterator sv_it(self->s->strokeVerticesEnd()); - return BPy_StrokeVertexIterator_from_StrokeVertexIterator(sv_it, 1); + return BPy_StrokeVertexIterator_from_StrokeVertexIterator(sv_it, true); } PyDoc_STRVAR(Stroke_stroke_vertices_size_doc, diff --git a/source/blender/freestyle/intern/view_map/Functions0D.h b/source/blender/freestyle/intern/view_map/Functions0D.h index 045ad317db2..647a3a530c6 100644 --- a/source/blender/freestyle/intern/view_map/Functions0D.h +++ b/source/blender/freestyle/intern/view_map/Functions0D.h @@ -65,13 +65,17 @@ using namespace Geometry; * \attention In the scripting language, there exists several prototypes depending on the returned value type. * For example, you would inherit from a UnaryFunction0DDouble if you wish to define a function that returns a double. * The different existing prototypes are: - * - UnaryFunction0DVoid - * - UnaryFunction0DUnsigned - * - UnaryFunction0DReal - * - UnaryFunction0DFloat * - UnaryFunction0DDouble + * - UnaryFunction0DEdgeNature + * - UnaryFunction0DFloat + * - UnaryFunction0DId + * - UnaryFunction0DMaterial + * - UnaryFunction0DUnsigned * - UnaryFunction0DVec2f * - UnaryFunction0DVec3f + * - UnaryFunction0DVectorViewShape + * - UnaryFunction0DViewShape + * - UnaryFunction0DVoid */ template class UnaryFunction0D diff --git a/source/blender/freestyle/intern/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h index 0821475ca9c..d2a5870f27a 100644 --- a/source/blender/freestyle/intern/view_map/Functions1D.h +++ b/source/blender/freestyle/intern/view_map/Functions1D.h @@ -55,13 +55,14 @@ namespace Freestyle { * \attention In the scripting language, there exists several prototypes depending on the returned value type. * For example, you would inherit from a UnaryFunction1DDouble if you wish to define a function that returns a double. * The different existing prototypes are: - * - UnaryFunction1DVoid - * - UnaryFunction1DUnsigned - * - UnaryFunction1DReal - * - UnaryFunction1DFloat * - UnaryFunction1DDouble + * - UnaryFunction1DEdgeNature + * - UnaryFunction1DFloat + * - UnaryFunction1DUnsigned * - UnaryFunction1DVec2f * - UnaryFunction1DVec3f + * - UnaryFunction1DVectorViewShape + * - UnaryFunction1DVoid */ template class UnaryFunction1D -- cgit v1.2.3