[Bf-blender-cvs] [7378aac] master: Freestyle: Minor fixes.
Tamito Kajiyama
noreply at git.blender.org
Mon Jun 2 08:32:03 CEST 2014
Commit: 7378aac2cb4770fd5ebd4d4c15c7369d9a8a5f7a
Author: Tamito Kajiyama
Date: Mon Jun 2 15:31:31 2014 +0900
https://developer.blender.org/rB7378aac2cb4770fd5ebd4d4c15c7369d9a8a5f7a
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.
===================================================================
M source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
M source/blender/freestyle/intern/view_map/Functions0D.h
M source/blender/freestyle/intern/view_map/Functions1D.h
===================================================================
diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
index 80765e7..7110eef 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 045ad31..647a3a5 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 T>
class UnaryFunction0D
diff --git a/source/blender/freestyle/intern/view_map/Functions1D.h b/source/blender/freestyle/intern/view_map/Functions1D.h
index 0821475..d2a5870 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 T>
class UnaryFunction1D
More information about the Bf-blender-cvs
mailing list