Merged changes in the trunk up to revision 49986.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 18 Aug 2012 15:20:35 +0000 (15:20 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 18 Aug 2012 15:20:35 +0000 (15:20 +0000)
commit22b30da565de53a0a1d34079d72b08fdb54ec8e3
tree3961db6cd06907f41ca64a8ddff92baa36d318aa
parent44e4c5f8316b34835c7900dc649bf8a1570afc0a
parente982e9b04f13be046d194643ed28aaedd6181f3b
Merged changes in the trunk up to revision 49986.
23 files changed:
build_files/scons/tools/Blender.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/SConscript
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_files.c
source/creator/CMakeLists.txt
source/creator/creator.c