Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 29 Jun 2017 08:11:17 +0000 (10:11 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 29 Jun 2017 08:11:17 +0000 (10:11 +0200)
commit2113dbb013f3ee37207c8ec3260d037c8a29f4c8
tree8c7c111ac028efd3f285ebe99001ea452704eb82
parent10c887762a01ec2f5326b5d51a47ac77744d5ec8
parenta57a7975a1625d0876ff6ac13c14d5784236eb7e
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/space_outliner/outliner_select.c
source/blender/blenkernel/intern/node.c
source/blender/editors/space_outliner/outliner_select.c