svn merge ^/trunk/blender -r43294:43338
authorCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jan 2012 01:39:57 +0000 (01:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jan 2012 01:39:57 +0000 (01:39 +0000)
commit705f23064e8ba3e96690d163c98687fc79d4a179
tree13251a1f24cfb219a62c4f64c6750cadec7ff712
parent9e59fed5d8ff9f63477b3a73d2b02eaa55abd6cd
parentdbdd1c2ea7496546f4f7e17350720a6005cdb187
svn merge ^/trunk/blender -r43294:43338
36 files changed:
CMakeLists.txt
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenlib/BLI_editVert.h
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/editmesh_tools.c
source/blender/editors/curve/editcurve.c
source/blender/editors/curve/editfont.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_transform.c
source/blender/editors/render/render_shading.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_snap.c
source/blender/editors/util/undo.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/intern/wm_init_exit.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp