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:
authorBastien Montagne <bastien@blender.org>2020-08-03 13:36:52 +0300
committerBastien Montagne <bastien@blender.org>2020-08-03 13:36:52 +0300
commitdb5915d86353a16f6d6634ae3dba0acbc4553505 (patch)
treec982ad15f8121b271ea1008acbdf0ca5bf0982e6 /source/blender/python
parent633e9cef8c1de363200d361cced20dcb2dc60b97 (diff)
parentb5e345154057385100f40a31a513ece7ff3e244a (diff)
Merge branch 'blender-v2.90-release'
Diffstat (limited to 'source/blender/python')
-rw-r--r--source/blender/python/intern/bpy_props.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c
index a1f9d4afc51..830acd987d9 100644
--- a/source/blender/python/intern/bpy_props.c
+++ b/source/blender/python/intern/bpy_props.c
@@ -2961,7 +2961,7 @@ PyDoc_STRVAR(BPy_StringProperty_doc,
"default=\"\", "
"maxlen=0, "
"options={'ANIMATABLE'}, "
- "options=set(), "
+ "override=set(), "
"tags=set(), "
"subtype='NONE', "
"update=None, "