Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 14 Jun 2018 10:39:52 +0000 (12:39 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 14 Jun 2018 10:39:52 +0000 (12:39 +0200)
commit4bf751be7012827758b5b2ae844e370028921bd2
tree40102707050faa5742a7e435a7f3d68804fa53a1
parenta671aa922a1591128f0a1478c29af39ff6eca61f
parent66407e15cb5136bdbed45b9e0576b1e9863c3f4f
Merge branch 'master' into blender2.8

Conflicts:
source/blender/modifiers/intern/MOD_normal_edit.c
source/blender/windowmanager/intern/wm_files.c
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_normal_edit.c
source/blender/windowmanager/intern/wm_cursors.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_keymap.c
source/blender/windowmanager/intern/wm_window.c
source/blender/windowmanager/wm_files.h