Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 9 Nov 2018 23:57:35 +0000 (10:57 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 9 Nov 2018 23:57:35 +0000 (10:57 +1100)
commit0121258770584b495964f5ba241bdead2018eb22
treef8d70746768ccbabd1328d40e462de068e162398
parent2f44ea68d3dcbf60887617255136e659d7edff37
parent7efac2b0b09d9e76d9fc573ec7936a1c6440c067
Merge branch 'master' into blender2.8
source/blender/editors/space_script/script_edit.c
source/blender/python/BPY_extern.h
source/blender/python/intern/bpy_interface.c
source/blender/windowmanager/intern/wm_files.c
source/creator/creator_args.c