svn merge ^/trunk/blender -r42778:42839
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Dec 2011 08:41:53 +0000 (08:41 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Dec 2011 08:41:53 +0000 (08:41 +0000)
commit4ced91da47ec1e95d71beef07b218fd0290ff68a
tree5f96c6268e194dd4cabcbe33efdc2fd226652cab
parent87a34772003413bd402ea380ce5d8d7c3f3a6337
parentac498a6b64ea2f034aa0177894fb25d0401e327b
svn merge ^/trunk/blender -r42778:42839
28 files changed:
intern/cycles/blender/blender_mesh.cpp
release/scripts/startup/bl_operators/uvcalc_smart_project.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/SConscript
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_snap.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/intern/dna_genfile.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/strand.c
source/creator/CMakeLists.txt
source/gameengine/Converter/BL_BlenderDataConversion.cpp