Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 8 Feb 2018 10:43:37 +0000 (21:43 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 8 Feb 2018 10:43:37 +0000 (21:43 +1100)
commit127d515f3d3309b4b9311978b0bcddaa28c65cf5
treeccd8e445ab439d0650c557f62a92fe804beac48b
parent345c6298e995ea618c34282ba6d7ab5af032f191
parent1ddd03b793f6856a1278f3d8a32baca318896dfe
Merge branch 'master' into blender2.8
source/blender/editors/object/object_bake_api.c