Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 18 Jul 2017 03:09:36 +0000 (13:09 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 18 Jul 2017 03:09:36 +0000 (13:09 +1000)
commit2475dbdc94d8ebc53e7285e69c9900b7989f1e1c
treebfb875e9e88f284a8064c9883d223454d6877852
parentf04c06498bd3bfc439cbcf35297a09112f8610b6
parent66383ea206d882fd8737c8e8da5355095e614bc8
Merge branch 'master' into blender2.8
doc/python_api/sphinx_doc_gen.py
source/blender/collada/AnimationExporter.cpp
source/blender/editors/object/object_transform.c
source/blender/editors/transform/transform_snap_object.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/windowmanager/intern/wm_window.c