Merge with trunk r39000
authorMiika Hamalainen <blender@miikah.org>
Wed, 3 Aug 2011 18:47:20 +0000 (18:47 +0000)
committerMiika Hamalainen <blender@miikah.org>
Wed, 3 Aug 2011 18:47:20 +0000 (18:47 +0000)
commitdaea8a28ae11131c86d98f20b819ad33036b875a
tree85faba3c1aaa0c45db61c714e1337c8c008c3adc
parent8394f65d4a6019ae623fe32268a769463a189b9e
parent79c87852d2a2b07ba3cb411e00fd0fb4aaee008a
Merge with trunk r39000
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blenderplayer/bad_level_call_stubs/stubs.c