svn merge -r36672:36725 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 17 May 2011 07:03:12 +0000 (07:03 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 17 May 2011 07:03:12 +0000 (07:03 +0000)
commit4514be8f4ff5c87824e447c7016939363f66f78c
tree23f829755b81c71891d831ac8b9c57a23a283e2d
parent2a12e8b7e4a08fb57e72de5ce62d61b698828f84
parent1294504603dcd538f3900e3d254e37375cde9c35
svn merge -r36672:36725 https://svn.blender.org/svnroot/bf-blender/trunk/blender
26 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_view3d.h
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_modifier.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_image/CMakeLists.txt
source/blender/editors/space_image/SConscript
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp