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)
1  2 
source/blender/blenkernel/BKE_global.h
source/blender/windowmanager/intern/wm_operators.c
source/creator/creator_args.c

Simple merge