Merge branch 'master' into blender2.8
authorGermano <germano.costa@ig.com.br>
Tue, 23 Jan 2018 03:00:16 +0000 (01:00 -0200)
committerGermano <germano.costa@ig.com.br>
Tue, 23 Jan 2018 03:00:16 +0000 (01:00 -0200)
commit3a712632f50875368eaccc7eaead573b732c8175
tree5bce0a5c91b54e10288061fc1d2a8fafb0a1906c
parent1c98fbf9826b6a3909df5428831cfa426d1178e7
parent85ca39ec4bd180420828a794bca49d5008dd5a7b
Merge branch 'master' into blender2.8

# Conflicts:
# source/blender/editors/screen/screen_ops.c
source/blender/editors/screen/screen_ops.c