svn merge -r40279:40295 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Sat, 17 Sep 2011 13:15:38 +0000 (13:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 17 Sep 2011 13:15:38 +0000 (13:15 +0000)
commit17f0ff5f7f05dfff0c7ce298118d58894102e4d0
tree4a575eae5d19bbfd9054585ad40c7f33f0cdc6a2
parentfa206e2c72b2301941cd7867a4366341ed7d4b39
parent3232102cb8c50ff4463ab0d0de3f47d3196d66ea
svn merge -r40279:40295 ^/trunk/blender
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/particle.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/armature/editarmature.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/uvedit/uvedit_draw.c
source/blender/render/intern/source/convertblender.c