Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 3 Feb 2018 15:10:01 +0000 (16:10 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 3 Feb 2018 15:10:01 +0000 (16:10 +0100)
commit1bc0cd00713a573bed76ab35b6ae0cc0e9edc307
treea24e6f88aee2a999b187dd416bef941af6450677
parent065a84c8d0d68edece9a407dbe97828fe22d3a6f
parentdb989e1f118071aae6dcd9f29d10182bd5ebed0b
Merge branch 'master' into blender2.8
20 files changed:
intern/cycles/blender/addon/ui.py
intern/cycles/blender/addon/version_update.py
intern/cycles/blender/blender_mesh.cpp
intern/cycles/blender/blender_shader.cpp
release/datafiles/locale
release/scripts/addons
release/scripts/addons_contrib
release/scripts/startup/nodeitems_builtins.py
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/node.c
source/blender/editors/space_node/drawnode.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/makesdna/DNA_node_types.h
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_displacement.c
source/blender/nodes/shader/nodes/node_shader_vector_displacement.c
source/tools