Merge branch 'master' into soc-2019-openxr
authorJulian Eisel <eiseljulian@gmail.com>
Tue, 16 Jul 2019 19:09:30 +0000 (21:09 +0200)
committerJulian Eisel <eiseljulian@gmail.com>
Tue, 16 Jul 2019 19:09:30 +0000 (21:09 +0200)
commitfca4826c7f9d3258434df1b463189ca232cfd5c8
tree04b6a047cd3ba879a2c886365c2228bde6a644f0
parentb0845fc1332bf242237fe858803bcebe87ffd7b3
parenta36a44bb811d8dbe39dfaf79e21c509b3134ec66
Merge branch 'master' into soc-2019-openxr
source/blender/blenkernel/BKE_global.h
source/blender/windowmanager/intern/wm_operators.c
source/creator/creator_args.c