Merge with trunk r39589
authorMiika Hamalainen <blender@miikah.org>
Sun, 21 Aug 2011 19:37:19 +0000 (19:37 +0000)
committerMiika Hamalainen <blender@miikah.org>
Sun, 21 Aug 2011 19:37:19 +0000 (19:37 +0000)
commitc5106fd097cb51a8d9b24cb7ed4759b9ea30051f
tree3aaf572d4b808169a4aa76d6e7723e19590fa61e
parent5b7133448439a510e779209c35aebd4cf38ff637
parent36f20f162caf83929e6eb07be6b73eb59740ead4
Merge with trunk r39589
24 files changed:
release/scripts/startup/bl_ui/__init__.py
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/properties_physics_common.py
release/scripts/startup/bl_ui/space_time.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/particle.c
source/blender/blenlib/intern/math_geom.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object_force.c
source/blender/render/intern/source/render_texture.c
source/blender/render/intern/source/voxeldata.c
source/blenderplayer/bad_level_call_stubs/stubs.c