Merge branch 'master' into blender2.8
authorGermano <germano.costa@ig.com.br>
Fri, 8 Dec 2017 14:43:52 +0000 (12:43 -0200)
committerGermano <germano.costa@ig.com.br>
Fri, 8 Dec 2017 14:43:52 +0000 (12:43 -0200)
commitf57317c6e74c8f7b0fbcc561f6a8d800bdab8296
treea7b53e5c7a78cc0a9369ef291864814a5d3dd690
parent8817faa02d011637dd6fa136fcdf93ef4de7e32d
parente6838ecc260441dcba0abfcd8a8292b94081df64
Merge branch 'master' into blender2.8
source/blender/editors/space_view3d/drawobject.c