Merge branch 'blender2.7'
authorCampbell Barton <ideasman42@gmail.com>
Thu, 3 Jan 2019 01:23:17 +0000 (12:23 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 3 Jan 2019 01:25:37 +0000 (12:25 +1100)
commitba9e10fd6a5b7052d25f34343b7b723d25a94490
treef9b45841dbbcc40c9c2e0b40f9d69d572589adc5
parent11f2c65128dc9bdead56003df7c282b6e091cbd1
parent847b21ee08e5a30a2fe35ede4c5b3a73af404af7
Merge branch 'blender2.7'
source/blender/blenkernel/BKE_material.h
source/blender/blenkernel/intern/material.c
source/blender/editors/render/render_shading.c