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)
commitd370e6c3eae84893f3a65e59d892110d1e974fce
tree04bfb91bcf7361dfbba0e9f3a6282d7cd5ec7f01
parent4c1ee477070083f12bf802e551b14179e0c4579a
parentd0d9360a6663efb16e4fbc35554be61bf54630e3
Merge remote-tracking branch 'origin/master' into blender2.8
source/blender/makesrna/intern/rna_render.c
source/blender/windowmanager/intern/wm_draw.c