Merge branch 'blender2.8' into blender2.8-workbench
authorJeroen Bakker <j.bakker@atmind.nl>
Fri, 20 Apr 2018 10:49:02 +0000 (12:49 +0200)
committerJeroen Bakker <j.bakker@atmind.nl>
Fri, 20 Apr 2018 10:49:02 +0000 (12:49 +0200)
commit6f61983da3c78658d5de4b4ae0412672c52bebe5
tree4777ca4db9b63fe7f3c8912b6ac086e7bd6d7aca
parent7d38379e496aabe668dd4d1f1f4af6c243b306dc
parent89bdc208d146eaf08f90c3dec2eb92f66b933d00
Merge branch 'blender2.8' into blender2.8-workbench
release/scripts/startup/bl_ui/space_view3d.py
source/blender/makesrna/intern/rna_space.c