Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 27 May 2018 09:06:29 +0000 (11:06 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 27 May 2018 09:06:29 +0000 (11:06 +0200)
commit9a74b603670cc3fab14d9fcd7be7b3c17731a8ee
tree0611021c1450e586308d58223353793dcc137afe
parent474971f3d84e5eacde7e92fc86ef4e10a5e0786c
parentbc3727a94374d9c56745c943a1e6574627a88510
Merge branch 'master' into blender2.8
22 files changed:
build_files/cmake/platform/platform_win32.cmake
intern/cycles/blender/blender_shader.cpp
intern/cycles/blender/blender_util.h
intern/cycles/kernel/kernel_light.h
intern/cycles/render/light.cpp
intern/cycles/render/light.h
make.bat
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/nodeitems_builtins.py
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/bpath.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/pointcache.c
source/blender/editors/space_info/info_stats.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/RNA_access.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