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)
commit5a3c6ccadb8925d6e2b1da2b2861de35b33f939f
treeee9b2a9e66c60f10f963399f198a9268b2cc5bc6
parent4393df93202198b5eaaff438e18060c66b98928d
parent59dbd53e72ae25edf247e49ea1e291af277fecc4
Merging r39847 through r39930 from trunk into vgroup_modifiers.
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesrna/intern/rna_modifier.c