Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 5 Mar 2018 15:14:46 +0000 (16:14 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 5 Mar 2018 15:14:46 +0000 (16:14 +0100)
commit84a154ac68d01583b318cca43d8d8bbded127700
tree6414db1d253a5bbf0314a95b1cef47e2ef9da83c
parentae9beb1cead99ced03798f6acad8082408323991
parentdf267bd4c48a3b73ad959951419161ae8f9ed126
Merge branch 'master' into blender2.8
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_apple.cmake
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/space_sequencer/sequencer_edit.c