svn merge -r36900:37028 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 31 May 2011 05:11:04 +0000 (05:11 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 31 May 2011 05:11:04 +0000 (05:11 +0000)
commit08d6932c860e7f2926e3980764fc5e11a821d0a3
tree0d88c8f33701ce024f5c64317d05a5116dbc19ba
parent38293a00c379bdeb224a73279ee08850d86f308c
parentdcd55cef86270f076cf827c5ae7a6cc76db4f9ad
svn merge -r36900:37028 https://svn.blender.org/svnroot/bf-blender/trunk/blender
26 files changed:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_hook.c
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_armature.c
source/blender/python/generic/bpy_internal_import.h
source/creator/CMakeLists.txt
source/creator/creator.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp