Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 25 May 2018 08:04:25 +0000 (10:04 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 25 May 2018 08:04:25 +0000 (10:04 +0200)
commitef22d2e8adb9965cd3cb91e733d4b9754cf6024f
tree1d95a52cd619be4b9974c6aa2f197373a1831912
parent2a6e4f71576ebee19f34fd5f7c214fd2e9f060f8
parentd02335a1950c81fffea815f31e47bca92ab7d33c
Merge branch 'master' into blender2.8
source/blender/editors/include/ED_view3d.h
source/blender/editors/space_view3d/view3d_project.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/shader/nodes/node_shader_math.c