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