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)
commit35ec72bcb8654fd5f7bac6b3d0ccb95db1134ec6
treecb164b607c133b6a56967c07da616d2e08395d9e
parentf2d7a28a0984bfebda21c07e9508313f0d92610c
parent038b73bab1f6ed3aa2360e1f4946234110a5cf2c
Merge branch 'master' into blender2.8
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/rigidbody.c