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)
1  2 
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

Simple merge