Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 26 Jun 2017 03:43:56 +0000 (13:43 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 26 Jun 2017 03:43:56 +0000 (13:43 +1000)
commit6d1ae5897f03476076509a784244cd0316cc696c
treee28c18eb38b41fc35d45d74ec74a6284f81cee4e
parentfb96228441d98f9af5d8d7361359a54c9b554967
parent0172ed8fe55b402b95be51f4d876da9794b2ac55
Merge branch 'master' into blender2.8
source/blender/editors/interface/interface.c
source/blender/makesrna/intern/rna_linestyle.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_ui_api.c