archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Sergey Sharybin
2018-08-31 17:08:29 +02:00
parent fede95aa68 8a3b548cb2
commit 7f36fb458c
8 changed files with 37 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/intern/bpy_props.c
View File

@@ -1904,7 +1904,7 @@ static void bpy_prop_callback_assign_enum(struct PropertyRNA *prop, PyObject *ge
" :type description: string\n" \
#define BPY_PROPDEF_UNIT_DOC \
" :arg unit: Enumerator in ['NONE', 'LENGTH', 'AREA', 'VOLUME', 'ROTATION', 'TIME', 'VELOCITY', 'ACCELERATION'].\n" \
" :arg unit: Enumerator in ['NONE', 'LENGTH', 'AREA', 'VOLUME', 'ROTATION', 'TIME', 'VELOCITY', 'ACCELERATION', 'MASS', 'CAMERA'].\n" \
" :type unit: string\n" \
#define BPY_PROPDEF_NUM_MIN_DOC \