Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Thu, 4 Jan 2018 17:57:48 +0000 (15:57 -0200)
committerDalai Felinto <dfelinto@gmail.com>
Thu, 4 Jan 2018 17:57:48 +0000 (15:57 -0200)
1  2 
source/blender/blenkernel/intern/material.c
source/blender/render/intern/source/render_result.c