Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 23 Aug 2017 10:16:47 +0000 (20:16 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 23 Aug 2017 10:16:47 +0000 (20:16 +1000)
1  2 
source/blender/blenlib/BLI_utildefines.h
source/blender/blenlib/CMakeLists.txt

Simple merge