Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 9 May 2017 12:33:05 +0000 (14:33 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 9 May 2017 12:33:05 +0000 (14:33 +0200)
commit86c299c6a48036258096eb0c3447cad86369d4de
treef596e89e89fafc7d52efccae34c11807d58554c0
parentdad797d03773164f69fbca40aa4be2ef5ad535db
parentffc95a33b62821e8eb66cf7003942e37976d20d7
Merge branch 'master' into blender2.8
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/makesrna/intern/rna_space.c