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)
commit272973804e39358b4fdbb1e954ebcd52a2f6b152
treeb80eb4f13fc2ac68b6a279b72a0302acdcd14ca2
parent702c0a01b24869d6cb133ee00e1f85fc302c45a5
parent855799ecc1c5e53d9fbfe520fd5402bc0138f674
Merge branch 'master' into blender2.8
build_files/cmake/platform/platform_win32.cmake
source/blender/blenkernel/BKE_animsys.h
source/blender/editors/space_sequencer/sequencer_edit.c