Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 24 Nov 2018 22:44:17 +0000 (23:44 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 24 Nov 2018 22:44:17 +0000 (23:44 +0100)
commita2e209f20a44d14c1c56ba9f69b6589c318c7199
tree8e6288017746946316c96973c48bd5e64a9bb7a3
parent13fa509187e0cc7e3b9df806dc2496b7516e2cd3
parent33750e8abbade21813365a7dd62e036969d5006c
Merge branch 'master' into blender2.8
intern/ghost/intern/GHOST_SystemX11.cpp
release/scripts/startup/bl_operators/uvcalc_smart_project.py
source/blender/makesrna/intern/rna_sequencer.c