svn merge ^/trunk/blender -r46330:46335
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Mon, 7 May 2012 22:28:59 +0000 (22:28 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Mon, 7 May 2012 22:28:59 +0000 (22:28 +0000)
commit1d5440350d36ef8891063464733cc6d6a434898f
treefbbd888ebce98696e913401139244c9fd3fe43b8
parentbc86c410f773aabeb4526679dd0d4c6aba66e793
parent364388b9f2a2ddc838f8182537c1ddf3f0ea0f0b
svn merge ^/trunk/blender -r46330:46335
21 files changed:
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/collada/MeshImporter.cpp
source/blender/collada/SkinInfo.cpp
source/blender/editors/mesh/editmesh_utils.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesrna/intern/rna_curve.c
source/blender/modifiers/intern/MOD_uvproject.c