svn merge -r41722:41723 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Fri, 11 Nov 2011 06:25:45 +0000 (06:25 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 11 Nov 2011 06:25:45 +0000 (06:25 +0000)
commit92d35b74e79e63ae95732cf3161e84ace1e79e59
tree19a8ecf74bfcae5187a4e25520f4e55384e7707b
parent67386c003d5d4bd5355323acdfbef1aa9fa2b71d
parentafeb0eeaf0e8caf5e46a5dd6fbea3786e9fb1354
svn merge -r41722:41723 ^/trunk/blender
32 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/CMakeLists.txt
source/blender/blenkernel/BKE_customdata.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/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/BLI_math_geom.h
source/blender/blenlib/BLI_threads.h
source/blender/blenlib/intern/math_geom.c
source/blender/blenlib/intern/threads.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/ED_mesh.h
source/blender/editors/mesh/mesh_data.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_modifier.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.c
source/blender/modifiers/intern/MOD_util.h
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/modifiers/intern/MOD_wave.c
source/blender/render/intern/source/convertblender.c
source/blenderplayer/bad_level_call_stubs/stubs.c