svn merge ^/trunk/blender -r43062:43085
authorCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jan 2012 02:16:52 +0000 (02:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jan 2012 02:16:52 +0000 (02:16 +0000)
commitc0eec8f379bb0c265e7bf2ad74397c22836bae3c
tree6502b4e6eaf44a848bebe6406aacd825738877d9
parent68c4368001db49bd3daab96352ca3b4fb7d04e1c
parent84437bb5e9342e67f448e26adb0c4b0811f3ef5c
svn merge ^/trunk/blender -r43062:43085
12 files changed:
CMakeLists.txt
intern/cycles/blender/blender_mesh.cpp
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/armature/editarmature.c
source/blender/editors/include/ED_object.h
source/blender/editors/mesh/mesh_data.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/physics/particle_object.c
source/blender/editors/render/render_shading.c
source/blender/gpu/intern/gpu_buffers.c