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)
commita9e3ac906e23dc72b8af1b07a25286ed0a6b0bcb
tree0fff63db23ebb4c99c6af4b05cfcd723d290bde1
parent205978a489276d2b9450be77cdfcb5f987830d06
parent95d83b9b23e4aa8158e20fc94ec68b793c4bb87a
Merge remote-tracking branch 'origin/master' into blender2.8
source/blender/blenkernel/intern/material.c
source/blender/render/intern/source/render_result.c