Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 6 Mar 2018 09:04:02 +0000 (20:04 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 6 Mar 2018 09:04:02 +0000 (20:04 +1100)
commit85b68aaf7fae6b3bad1b42bcbba7bef41fd0145f
tree015ca83a25f715dbfc21bf9428a19e34eba4f84f
parenta5a0dcec902d6bbff0fe0fc1bb7fb21045823166
parent4d86a432da19826ca28f26af30b24edf18e53553
Merge branch 'master' into blender2.8
source/blender/editors/include/ED_object.h
source/blender/editors/sculpt_paint/sculpt.c