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/StrokeShader/BPy_BlenderTextureShader.cpp | |
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/StrokeShader/BPy_BlenderTextureShader.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp index 379fb7e1b12..0e603e00f97 100644 --- a/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp +++ b/source/blender/freestyle/intern/python/StrokeShader/BPy_BlenderTextureShader.cpp @@ -37,7 +37,7 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char BlenderTextureShader___doc__[] = -"Class hierarchy: :class:`StrokeShader` > :class:`BlenderTextureShader`\n" +"Class hierarchy: :class:`freestyle.types.StrokeShader` > :class:`BlenderTextureShader`\n" "\n" "[Texture shader]\n" "\n" @@ -47,7 +47,8 @@ static char BlenderTextureShader___doc__[] = "\n" " :arg texture: A line style texture slot or a shader node tree to define\n" " a set of textures.\n" -" :type texture: :class:`LineStyleTextureSlot` or :class:`ShaderNodeTree`\n" +" :type texture: :class:`bpy.types.LineStyleTextureSlot` or\n" +" :class:`bpy.types.ShaderNodeTree`\n" "\n" ".. method:: shade(stroke)\n" "\n" @@ -55,7 +56,7 @@ static char BlenderTextureShader___doc__[] = " simulate marks.\n" "\n" " :arg stroke: A Stroke object.\n" -" :type stroke: :class:`Stroke`\n"; +" :type stroke: :class:`freestyle.types.Stroke`\n"; static int BlenderTextureShader___init__(BPy_BlenderTextureShader *self, PyObject *args, PyObject *kwds) { |