Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 23 Nov 2017 18:16:11 +0000 (19:16 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 23 Nov 2017 18:16:11 +0000 (19:16 +0100)
commit4f8bffa7bfe46192b43c75d864e2117369cbffdd
tree3e869e57151f4d487106d59bba1f2282a9578a44
parentb79b8478ee3bb1b115c5d6b8bdb0cc74d5169955
parentdebd9f6ea1286533d4d5c9262fa6724c862fe35e
Merge branch 'master' into blender2.8
intern/cycles/render/buffers.cpp
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/makesrna/intern/rna_scene.c
source/blender/nodes/shader/node_shader_tree.c
source/blender/render/intern/source/render_result.c