Merging r39847 through r39930 from trunk into vgroup_modifiers.
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 5 Sep 2011 16:27:25 +0000 (16:27 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 5 Sep 2011 16:27:25 +0000 (16:27 +0000)
1  2 
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesrna/intern/rna_modifier.c