Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/windowmanager/WM_types.h