svn merge ^/trunk/blender -r40720:40872
authorCampbell Barton <ideasman42@gmail.com>
Sun, 9 Oct 2011 07:31:15 +0000 (07:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 9 Oct 2011 07:31:15 +0000 (07:31 +0000)
commitaa6d7ebd145ff375a9dc876d33065f80d94accca
tree4c9562c2575294c94bd55cb4b3bd25a9e7e793b6
parent9d0186fc6a5aa0aab36b9a1f52e3cd5e1ac46767
parent8714fb7019e853703ce8b102edac43d84b7bbe14
svn merge ^/trunk/blender -r40720:40872
42 files changed:
CMakeLists.txt
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/curve/editfont.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/util/ed_util.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/intern/dna_genfile.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_curve.c
source/blender/makesrna/intern/rna_image_api.c
source/blender/makesrna/intern/rna_main_api.c
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/blender/makesrna/intern/rna_ui_api.c
source/blender/python/intern/bpy_app_handlers.c
source/blender/python/mathutils/mathutils.c
source/blender/render/intern/source/convertblender.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt