Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 17 Jul 2017 03:21:05 +0000 (13:21 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 17 Jul 2017 03:21:05 +0000 (13:21 +1000)
commit193d7d6333882112e31dd4f6196f795a8b7d5022
treea345728d886747d460c0dd7218da0ed127768ef2
parenta11808a248200a7ee5a9fca0ae16581fee1c249b
parentbc8a9c47c689b46f20830603b33a1d9041e0ffe3
Merge branch 'master' into blender2.8
doc/python_api/sphinx_doc_gen.py
source/blender/editors/screen/screen_ops.c
source/blender/python/intern/bpy_interface.c