Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 14 Feb 2018 14:16:50 +0000 (15:16 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 14 Feb 2018 14:16:50 +0000 (15:16 +0100)
commit3102bf28890c06b03cf7455604ec00fd1e27e89c
tree47e0d1c09f146a51fc19e855c1fa2600db369787
parent618bc6c67954f80b3c0c0332f44648b3187c23ca
parentf6107af4cf4d907495e2e9c18e5866fd1d420650
Merge branch 'master' into blender2.8
CMakeLists.txt
intern/cycles/blender/blender_curves.cpp
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_child.c
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/nodes/shader/nodes/node_shader_particle_info.c