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)
1  2 
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/makesrna/intern/rna_space.c