Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 5 May 2018 12:42:10 +0000 (14:42 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 5 May 2018 12:42:15 +0000 (14:42 +0200)
commit29aa531e5137b9c16b04857a7b66385e78486342
treecdec8833f0f3f96b40dd0e44e970c24ce7f131a2
parentf91e9529dacb21ef709e7fd1ef8f989731a5a2f3
parentd3b3df037197d46b608eb38a5dbd6f1d2761ec36
Merge branch 'master' into blender2.8
source/blender/blenkernel/BKE_idprop.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/idprop.c