diff options
author | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-10-07 19:39:17 +0400 |
---|---|---|
committer | Jason Wilkins <Jason.A.Wilkins@gmail.com> | 2014-10-07 19:39:17 +0400 |
commit | 189c2e9277d4abd3b750a5a60ef42549dcfe359d (patch) | |
tree | 1430a845f4aab56b9133c3d8c6ffac09ee6dd92a /source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material | |
parent | 771bad9c6abaad4b742935e5d55067f281287650 (diff) | |
parent | 1519b6a23e0341e25bf5a5c714f9f3d119ab8781 (diff) |
Merge branch 'master' into soc-2014-viewport_contextsoc-2014-viewport_context
Diffstat (limited to 'source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material')
-rw-r--r-- | source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp index b54ed48edc3..cbb905dcf2e 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp @@ -35,7 +35,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char MaterialF0D___doc__[] = -"Class hierarchy: :class:`UnaryFunction0D` > :class:`UnaryFunction0DMaterial` > :class:`MaterialF0D`\n" +"Class hierarchy: :class:`freestyle.types.UnaryFunction0D` > :class:`freestyle.types.UnaryFunction0DMaterial` > :class:`MaterialF0D`\n" "\n" ".. method:: __init__()\n" "\n" @@ -44,22 +44,22 @@ static char MaterialF0D___doc__[] = ".. method:: __call__(it)\n" "\n" " Returns the material of the object evaluated at the\n" -" :class:`Interface0D` pointed by the Interface0DIterator. This\n" -" evaluation can be ambiguous (in the case of a :class:`TVertex` for\n" -" example. This functor tries to remove this ambiguity using the\n" -" context offered by the 1D element to which the Interface0DIterator\n" -" belongs to and by arbitrary choosing the material of the face that\n" -" lies on its left when following the 1D element if there are two\n" -" different materials on each side of the point. However, there\n" -" still can be problematic cases, and the user willing to deal with\n" -" this cases in a specific way should implement its own getMaterial\n" -" functor.\n" +" :class:`freestyle.types.Interface0D` pointed by the\n" +" Interface0DIterator. This evaluation can be ambiguous (in the case of\n" +" a :class:`freestyle.types.TVertex` for example. This functor tries to\n" +" remove this ambiguity using the context offered by the 1D element to\n" +" which the Interface0DIterator belongs to and by arbitrary choosing the\n" +" material of the face that lies on its left when following the 1D\n" +" element if there are two different materials on each side of the\n" +" point. However, there still can be problematic cases, and the user\n" +" willing to deal with this cases in a specific way should implement its\n" +" own getMaterial functor.\n" "\n" " :arg it: An Interface0DIterator object.\n" -" :type it: :class:`Interface0DIterator`\n" +" :type it: :class:`freestyle.types.Interface0DIterator`\n" " :return: The material of the object evaluated at the pointed\n" " Interface0D.\n" -" :rtype: :class:`Material`\n"; +" :rtype: :class:`freestyle.types.Material`\n"; static int MaterialF0D___init__(BPy_MaterialF0D *self, PyObject *args, PyObject *kwds) { |