svn merge ^/trunk/blender -r42372:42416
authorCampbell Barton <ideasman42@gmail.com>
Sun, 4 Dec 2011 18:39:19 +0000 (18:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 4 Dec 2011 18:39:19 +0000 (18:39 +0000)
commit22a1ad61f93a4b060500e5295c58b128f24a2daf
tree5693c7acd41e5d325cf3f6f1675cbceb232dd8a4
parenta115c02605b2692710f5d9b64d87407b7ca5b374
parent937c5494c4933c65635450e66aeacffed74939f2
svn merge ^/trunk/blender -r42372:42416
24 files changed:
source/blender/CMakeLists.txt
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/multires.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/metaball/mball_edit.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_transform.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/makesdna/DNA_key_types.h
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_object.c
source/blender/modifiers/intern/MOD_mirror.c
source/blender/render/intern/source/convertblender.c