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)
1  2 
doc/python_api/sphinx_doc_gen.py
source/blender/editors/screen/screen_ops.c
source/blender/python/intern/bpy_interface.c

Simple merge