Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-09-13 12:21:08 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-09-13 12:21:08 +0300
commitaacdd28edd838a011615af2a998aa2d90b4a75f3 (patch)
tree0227cc480fc4076479fa434261d8f50b544f5d17
parente8fa13b01e843ece10ff477357a42436c90d7d1d (diff)
PyDoc: add bpy.app.icons to docs
-rw-r--r--doc/python_api/sphinx_doc_gen.py3
-rw-r--r--source/blender/python/intern/bpy_app_icons.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index 1a39ba0d02a..0a2fba4d8aa 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -1835,8 +1835,7 @@ def write_rst_importable_modules(basepath):
"bpy.app": "Application Data",
"bpy.app.handlers": "Application Handlers",
"bpy.app.translations": "Application Translations",
- # TODO(campbell)
- # "bpy.app.icons": "Application Icons",
+ "bpy.app.icons": "Application Icons",
"bpy.props": "Property Definitions",
"idprop.types": "ID Property Access",
"mathutils": "Math Types & Utilities",
diff --git a/source/blender/python/intern/bpy_app_icons.c b/source/blender/python/intern/bpy_app_icons.c
index 19e369e4bff..12315a6e112 100644
--- a/source/blender/python/intern/bpy_app_icons.c
+++ b/source/blender/python/intern/bpy_app_icons.c
@@ -101,8 +101,8 @@ PyDoc_STRVAR(bpy_app_icons_new_triangles_from_file_doc,
"\n"
" Create a new icon from triangle geometry.\n"
"\n"
-" :arg range: File path.\n"
-" :type range: string.\n"
+" :arg filename: File path.\n"
+" :type filename: string.\n"
" :return: Unique icon value (pass to interface ``icon_value`` argument).\n"
" :rtype: int\n"
);