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)
1  2 
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

Simple merge