Merge branch 'master' into blender2.8
authorAntonio Vazquez <blendergit@gmail.com>
Tue, 5 Dec 2017 18:04:34 +0000 (19:04 +0100)
committerAntonio Vazquez <blendergit@gmail.com>
Tue, 5 Dec 2017 18:04:34 +0000 (19:04 +0100)
1  2 
build_files/cmake/platform/platform_win32.cmake
source/blender/blenkernel/BKE_animsys.h
source/blender/editors/space_sequencer/sequencer_edit.c