Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 30 Nov 2018 06:07:59 +0000 (17:07 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 30 Nov 2018 06:07:59 +0000 (17:07 +1100)
commitcb8afaf5db9de16965dbb693cbd43cf767d5e7ed
tree3f753af9a9c6e124140c5e0c04460f4879288937
parent0f17425d6e8457dcd85e318910192d4c53a3dd68
parent6e253fc627462ff230ea003a8bd0e5e4dc6cc74e
Merge branch 'master' into blender2.8
intern/cycles/blender/blender_sync.cpp