Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 25 Mar 2017 02:49:13 +0000 (13:49 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 25 Mar 2017 02:49:13 +0000 (13:49 +1100)
commitf730e386eb0a23e544c02efa5159c47fad88c00c
tree2511de212da8cb3b414cf9c310b3e4930e748be7
parentedd2c556cda28becf38de6191d793c6f496495d9
parent7cb2974182173f4a48b89d4bdbc6a6aa9c9c50fd
Merge branch 'master' into blender2.8
release/scripts/startup/bl_operators/clip.py
release/scripts/startup/bl_operators/freestyle.py
release/scripts/startup/bl_operators/object.py
release/scripts/startup/bl_operators/rigidbody.py
release/scripts/startup/bl_ui/space_info.py
source/blender/makesdna/DNA_userdef_types.h
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operators.c