Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 7 May 2018 15:54:10 +0000 (17:54 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 7 May 2018 15:54:10 +0000 (17:54 +0200)
commitf62b826533422e5de3b08601e5511c233deda529
treec9d57326dfe030ba9c39060c0bdf1d3933e4c81b
parentb0b2a478539500b112a0f4b002a9d3d2123be0d0
parent905eeb0bc7f46efb95cb5450cc6c2ec27f02730c
Merge branch 'master' into blender2.8
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_image.c