Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 7 Jul 2018 06:53:00 +0000 (08:53 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 7 Jul 2018 06:53:00 +0000 (08:53 +0200)
commit80a31d30a4f6b793902d5d5ccd91f4fe3971e2b1
treecd85d01ae9d798c9773d436ba55347bd2a7541af
parenta6340a5068fd6ed8117ce8618f8b5901f324204d
parent4b373ed086993e5163c8a9a129400747bf6bed1c
Merge branch 'master' into blender2.8
release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/python/simple_enum_gen.py