Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 7 Nov 2017 23:20:59 +0000 (00:20 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 7 Nov 2017 23:20:59 +0000 (00:20 +0100)
commit7b1d7074817dac9d0f088e8e7e5b336bae662c36
tree4ebd67459d2fc160d3a6c76a2509cefc68f4e89c
parent1b18e158025a488e1ba2446ad93c2eb563c11611
parenta0478ebe379c8384376586e2880ebc813a6afef7
Merge branch 'master' into blender2.8
17 files changed:
intern/cycles/blender/blender_shader.cpp
intern/cycles/device/device.h
intern/cycles/device/device_cuda.cpp
release/scripts/startup/nodeitems_builtins.py
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/node.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_node/drawnode.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/makesrna/intern/rna_nodetree.c
source/blender/nodes/CMakeLists.txt
source/blender/nodes/NOD_shader.h
source/blender/nodes/NOD_static_types.h
source/blender/nodes/shader/nodes/node_shader_bevel.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c