Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 10 Apr 2017 14:53:12 +0000 (16:53 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 10 Apr 2017 14:53:12 +0000 (16:53 +0200)
commit346964eb3f3c3074d30676f27ed477ce542299ea
tree24112aba81885de0ccb4e21030df67635bae819c
parent39451ac7128ef753da24ae74486c51a8a40e2719
parentfd203a09330ce88725e8c5c8d9b1f9ce7b2f3c10
Merge branch 'master' into blender2.8

Conflicts:
source/blender/editors/gpencil/drawgpencil.c
build_files/build_environment/install_deps.sh
source/blender/blenkernel/intern/idprop.c
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/space_clip/clip_utils.c