Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 14 Feb 2018 20:49:13 +0000 (21:49 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 14 Feb 2018 20:49:13 +0000 (21:49 +0100)
commite6386ed286f2e0d7a68772a24e7979b45c1c5ad7
tree42f188bff5016f84f4e55c690bf1d134e5dc3cc4
parent2464dcef37f1a52db3c8a05922c0475fd3bff238
parentb5fe00d1ac43c16ec8f74d3ad7689599dfb2ef00
Merge branch 'master' into blender2.8
source/blender/gpu/GPU_material.h
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_material.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/nodes/shader/nodes/node_shader_particle_info.c
source/blender/render/extern/include/RE_shader_ext.h