Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 23 Feb 2018 18:02:49 +0000 (19:02 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 23 Feb 2018 18:02:49 +0000 (19:02 +0100)
commita44b08a6c473c0aae9f98dc13f9d000e5ea639bc
tree6b70d6026827b5cf6eed3af1c56a38329c2497bf
parent0305fc30b3ba6a1b24e2c9c182ae2e76d553f341
parent0aec2dcd3ae0ed382ffe7b3311a4e30fc88398e4
Merge branch 'master' into blender2.8
15 files changed:
intern/cycles/blender/blender_mesh.cpp
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_shader.cpp
release/scripts/startup/bl_operators/object_quick_effects.py
release/scripts/startup/nodeitems_builtins.py
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/smoke.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_draw.c
source/blender/makesrna/intern/rna_smoke.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_volume_scatter.c