Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Fri, 21 Oct 2016 12:22:50 +0000 (12:22 +0000)
committerDalai Felinto <dfelinto@gmail.com>
Fri, 21 Oct 2016 12:22:50 +0000 (12:22 +0000)
Conflicts:
source/blender/blenloader/intern/versioning_defaults.c

1  2 
source/blender/alembic/intern/abc_mesh.cc
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c