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)
1  2 
source/blender/render/intern/source/external_engine.c