Merge sculpt-dev -> master

2022-01-23 12:27:34 -08:00
parent 1acb608f52
commit ccbde00a83
393 changed files with 7658 additions and 4950 deletions
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -1762,6 +1762,7 @@ except ModuleNotFoundError:
    fw("html_show_sphinx = False\n")
    fw("html_baseurl = 'https://docs.blender.org/api/current/'\n")
    fw("html_use_opensearch = 'https://docs.blender.org/api/current'\n")
+    fw("html_show_search_summary = True\n")
    fw("html_split_index = True\n")
    fw("html_static_path = ['static']\n")
    fw("html_extra_path = ['static/favicon.ico', 'static/blender_logo.svg']\n")