Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Mon, 18 Sep 2017 12:44:44 +0000 (14:44 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Mon, 18 Sep 2017 12:44:44 +0000 (14:44 +0200)
1  2 
source/blender/makesrna/intern/rna_render.c
source/blender/windowmanager/intern/wm_draw.c