Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 5 Sep 2017 12:56:03 +0000 (22:56 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 5 Sep 2017 12:56:03 +0000 (22:56 +1000)
1  2 
CMakeLists.txt
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenlib/intern/math_matrix.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/rna_wm.c

diff --cc CMakeLists.txt
Simple merge
Simple merge