Merge branch 'master' into 28
authorCampbell Barton <ideasman42@gmail.com>
Wed, 10 May 2017 21:42:35 +0000 (07:42 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 10 May 2017 21:42:35 +0000 (07:42 +1000)
commit891159cea064ea83e78e9fb1ccb03bc2517ed62d
tree72f5ecab0e7b4cfb2ae609dbda434ed268fc188e
parent50b67d83a9eb2f19fe3ed09efa99a253ea9ec136
parentb82954f6f4e17c201859f9f15b2d73bd11fb68f2
Merge branch 'master' into 28
source/blender/render/intern/source/external_engine.c