Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 15 Jun 2017 08:17:51 +0000 (10:17 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 15 Jun 2017 08:17:51 +0000 (10:17 +0200)
1  2 
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/rigidbody.c

Simple merge