Merging r39652 through r39842 from trunk into vgroup_modifiers.
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 1 Sep 2011 17:49:57 +0000 (17:49 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 1 Sep 2011 17:49:57 +0000 (17:49 +0000)
commite4fd20c20c6a64678e7fe3907f795f527498414f
tree7fed9b1f23d8f59254ba7cdb022e4d7b5ba6fe0c
parente89046907327228fe0c8e5f554341d791e0fe0a5
parentf940e5fdd91ef02a454cd6a509f76953a77754dd
Merging r39652 through r39842 from trunk into vgroup_modifiers.
release/datafiles/blenderbuttons
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/datafiles/blenderbuttons.c
source/blender/editors/include/UI_icons.h
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_modifier.c