Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 15 Feb 2018 07:05:02 +0000 (18:05 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 15 Feb 2018 07:05:02 +0000 (18:05 +1100)
commitca7f826c6f1812d38cd3a6985b5fc8de6e9de78c
tree878cdf3252cf23c3ef519aaf98e4a4a8d6770724
parentb8b8669b282da70f4db2a89203adee014a98b204
parent58ba89b5bec5a2b7b74ef93fe18f0a3811cb48db
Merge branch 'master' into blender2.8
source/blender/nodes/shader/nodes/node_shader_displacement.c
source/blender/nodes/shader/nodes/node_shader_vector_displacement.c