diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-07-18 06:09:36 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-18 06:09:36 +0300 |
commit | 2475dbdc94d8ebc53e7285e69c9900b7989f1e1c (patch) | |
tree | bfb875e9e88f284a8064c9883d223454d6877852 /source/blender/python | |
parent | f04c06498bd3bfc439cbcf35297a09112f8610b6 (diff) | |
parent | 66383ea206d882fd8737c8e8da5355095e614bc8 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python')
-rw-r--r-- | source/blender/python/intern/bpy_props.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index c7787ba9682..362c0281b36 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -2697,7 +2697,8 @@ PyDoc_STRVAR(BPy_EnumProperty_doc, " :icon: An icon string identifier or integer icon value\n" " (e.g. returned by :class:`bpy.types.UILayout.icon`)\n" " :number: Unique value used as the identifier for this item (stored in file data).\n" -" Use when the identifier may need to change.\n" +" Use when the identifier may need to change. If the *ENUM_FLAG* option is used,\n" +" the values are bitmasks and should be powers of two.\n" "\n" " When an item only contains 4 items they define ``(identifier, name, description, number)``.\n" "\n" |