svn merge ^/trunk/blender -r43482:43524
authorCampbell Barton <ideasman42@gmail.com>
Thu, 19 Jan 2012 11:31:31 +0000 (11:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 19 Jan 2012 11:31:31 +0000 (11:31 +0000)
commit7b2101ace983cc9d7112dd45a8b264b51657dea9
treec1d75f2ae3f30fe9de51c1c7332e862064a93193
parent787ea5feb4a80babccd86689b066153ac57db91c
parenta87c5eb52cd4951b138f518bf12d498bc5e5eb8a
svn merge ^/trunk/blender -r43482:43524
15 files changed:
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/object/object_bake.c
source/blender/editors/sculpt_paint/CMakeLists.txt
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/render_texture.c