Merged changes in the trunk up to revision 53280.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 23 Dec 2012 00:23:11 +0000 (00:23 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 23 Dec 2012 00:23:11 +0000 (00:23 +0000)
commit40449b1994301081f96d014df626a5375e020c76
tree20220d8b071310fda8a0ab851c7a8f7bcc3ed8a2
parentfa0211df269a3398dd70467982f9e129c79e501b
parent3ca00cbf541d0283e91dc454866a5f24576271be
Merged changes in the trunk up to revision 53280.
30 files changed:
build_files/scons/tools/btools.py
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/intern/bpath.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_userdef_types.h
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_space.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/python/SConscript
source/blender/python/intern/bpy.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/shadeoutput.c
source/blender/windowmanager/WM_types.h