Merge branch 'master' into blender2.8
authorGermano <germano.costa@ig.com.br>
Sun, 21 Jan 2018 20:45:47 +0000 (18:45 -0200)
committerGermano <germano.costa@ig.com.br>
Sun, 21 Jan 2018 20:45:47 +0000 (18:45 -0200)
commit790025c01ed76c06e69e6054f1a718ca57771e28
tree7461d495f199142172b0efa34e5ad75ea65def6a
parent99efebd2dd24a8e0827cf0f13bc40c2844946676
parent8d671f6f6550605ac738f7a9727375a024614837
Merge branch 'master' into blender2.8

# Conflicts:
# intern/cycles/blender/blender_mesh.cpp
# source/blender/editors/screen/screen_ops.c
# source/blender/editors/space_view3d/drawobject.c
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/interface/interface_ops.c
source/blender/editors/screen/screen_draw.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_view3d/drawobject.c
source/blender/nodes/intern/node_socket.c