Merge commit 'origin/master^' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Thu, 29 Mar 2018 13:36:01 +0000 (10:36 -0300)
committerDalai Felinto <dfelinto@gmail.com>
Thu, 29 Mar 2018 13:36:01 +0000 (10:36 -0300)
commit11130970c6a3ff14cb4dd0caece2137891b43e87
treeb21d79b38e4ee28ed9762973e8ea1cc604dcfd1b
parentf6ad53804099802ab3f5eafa830f95f8545eb888
parentca5f3dd2200725712a665705fc25e20a208d6295
Merge commit 'origin/master^' into blender2.8
intern/ghost/intern/GHOST_SystemCocoa.h
intern/ghost/intern/GHOST_SystemCocoa.mm
intern/ghost/intern/GHOST_SystemWin32.h
source/blender/collada/AnimationImporter.cpp
source/blender/makesrna/intern/rna_scene_api.c
source/blender/windowmanager/intern/wm_window.c