Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sun, 15 Apr 2018 08:52:14 +0000 (10:52 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 15 Apr 2018 08:52:14 +0000 (10:52 +0200)
commitf3a8f97fcfa39d5dfe3e1f9d1b534e4f42ba9689
treed56e25593274c2db6015de345ffbfa414680abdb
parent94959dba1b53640e2a36cf9b5ca46aaf49c5c74a
parentd0e3fbc06b9c1560c98ba294912ff03ebe71acc5
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/text.c
source/blender/makesrna/intern/rna_scene.c