Merged changes in the trunk up to revision 53729.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 12 Jan 2013 02:02:53 +0000 (02:02 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 12 Jan 2013 02:02:53 +0000 (02:02 +0000)
commit94ae0232b0337ab70cecaef03cd845887cd36eaa
treecaea2819c7fe0400fb91c9bdf0e99a9e0fd50cf6
parent9a109c22ae1ef8a5c75932d661610b23ec685bd7
parentf68e9db583489d541d535791536ea20bc1ae1d76
Merged changes in the trunk up to revision 53729.

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenloader/intern/readfile.c
31 files changed:
SConstruct
build_files/scons/tools/btools.py
intern/cycles/blender/addon/ui.py
release/datafiles/startup.blend
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/bmesh_class.h
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_color.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/bmesh/bmesh_py_types.c
source/blender/python/intern/bpy.c
source/blender/python/intern/bpy_app.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
source/blender/windowmanager/intern/wm_files.c
source/creator/creator.c