Merge branch 'master' of git@git.blender.org:blender.git into blender2.8
authormano-wii <germano.costa@ig.com.br>
Tue, 11 Jul 2017 16:54:08 +0000 (13:54 -0300)
committermano-wii <germano.costa@ig.com.br>
Tue, 11 Jul 2017 16:54:08 +0000 (13:54 -0300)
commit538475dec7585bb77f57215e722f5b6762907d51
tree7708fa2b90ef82d302e74ff894a10f0a95bbe237
parent11ee5aa4f9b60ddb7597b65926c125d5536863ca
parentdd1edb0954b5441255b5a3616841228f466e448e
Merge branch 'master' of git@git.blender.org:blender.git into blender2.8

# Conflicts:
# source/blender/editors/transform/transform_snap_object.c
source/blender/editors/include/ED_transform_snap_object_context.h
source/blender/editors/transform/transform_snap_object.c
source/blender/makesrna/intern/rna_scene_api.c
source/blenderplayer/bad_level_call_stubs/stubs.c