Merging r39199 through r39485 from trunk into vgroup_modifiers.
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 17 Aug 2011 11:11:43 +0000 (11:11 +0000)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 17 Aug 2011 11:11:43 +0000 (11:11 +0000)
commit236a94268eac9d5154cd0de45569e59f24952451
tree6a0feb68a5060820b47b84f07a66d6cbfc91f514
parent97d4240911ef1a4b9aaca1a8e60a2204314be781
parentdd8d24ff9d48d4103e414cbe18e6c40644051f19
Merging r39199 through r39485 from trunk into vgroup_modifiers.
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_modifier.c