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
path: root/doc
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2020-01-13 17:58:42 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2020-01-13 17:58:42 +0300
commitefe119cd39b3239fd5b0fb2c6469e7554160e5de (patch)
treeaf2e118d6c509c7779afeacb6d53fdfbfa3edd9a /doc
parent3fdc04d3ee0ae459eebb33dede58abab20a2c1d4 (diff)
parentdfa3f51e5245a466eb2d5b568f606fc45d533602 (diff)
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'doc')
-rw-r--r--doc/python_api/sphinx_doc_gen.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/python_api/sphinx_doc_gen.py b/doc/python_api/sphinx_doc_gen.py
index 278a2700f27..b74ad3c7dc2 100644
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -989,6 +989,7 @@ def pymodule2sphinx(basepath, module_name, module, title):
# Changes in Blender will force errors here
context_type_map = {
# context_member: (RNA type, is_collection)
+ "active_annotation_layer": ("GPencilLayer", False),
"active_base": ("ObjectBase", False),
"active_bone": ("EditBone", False),
"active_gpencil_frame": ("GreasePencilLayer", True),
@@ -998,6 +999,8 @@ context_type_map = {
"active_operator": ("Operator", False),
"active_pose_bone": ("PoseBone", False),
"active_editable_fcurve": ("FCurve", False),
+ "annotation_data": ("GreasePencil", False),
+ "annotation_data_owner": ("ID", False),
"armature": ("Armature", False),
"bone": ("Bone", False),
"brush": ("Brush", False),