Merged changes in the trunk up to revision 54594.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 16 Feb 2013 18:38:03 +0000 (18:38 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 16 Feb 2013 18:38:03 +0000 (18:38 +0000)
24 files changed:
1  2 
SConstruct
build_files/scons/config/win32-vc-config.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenfont/BLF_translation.h
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh_class.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_buttons/buttons_header.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/bmesh/bmesh_py_types.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c

diff --cc SConstruct
Simple merge
Simple merge
Simple merge