Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 29 Jun 2016 15:45:16 +0000 (17:45 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 29 Jun 2016 15:45:16 +0000 (17:45 +0200)
1  2 
source/blender/blenkernel/intern/library_remap.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/transform/transform_snap_object.c
source/blender/makesrna/intern/rna_userdef.c