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)
commit572b1a644f29eff9b37b45543bfc27a2d68022c7
tree86d1a83307378ee0e1506021f8c0729d82f3cc06
parent7dfcbe01b0a2a1ca625c80eb385bf4753b3fb3ef
parent4d85396fe4f7e3a870fb844b5207179f7dd03eb2
Merge branch 'master' into blender2.8
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