Merged changes in the trunk up to revision 42902.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 27 Dec 2011 22:12:46 +0000 (22:12 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 27 Dec 2011 22:12:46 +0000 (22:12 +0000)
commit0896a227232f741b6028219a208ae60e78515406
tree2ad38505a7d5c960bdcd5537dbc6e319165ac118
parent6bfbb26f329f8d98a0ae0844f2cee0ba92c90d53
parent0059b8dd96bf065406441112f604e59f65d844d6
Merged changes in the trunk up to revision 42902.

Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/python/intern/bpy.c
28 files changed:
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editface.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/python/intern/bpy.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/shadeoutput.c
source/creator/CMakeLists.txt
source/creator/creator.c