Merge with trunk r40991
authorMiika Hamalainen <blender@miikah.org>
Thu, 13 Oct 2011 21:43:02 +0000 (21:43 +0000)
committerMiika Hamalainen <blender@miikah.org>
Thu, 13 Oct 2011 21:43:02 +0000 (21:43 +0000)
commit8be3249537e7930e0fa5adb59bc343455da309e9
tree0f4f14b046742f4380540e06c529cd417ddbc541
parent8bf78d7f5676520bf6f4241afb88fba506e342f4
parent818c098004ff64adcc0ff24fe29d40850f5591ce
Merge with trunk r40991
20 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/BKE_pointcache.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/particle.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.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/rna_modifier.c
source/blender/makesrna/intern/rna_space.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/intern/MOD_util.c
source/blenderplayer/bad_level_call_stubs/stubs.c