Merged changes in the trunk up to revision 48505.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 3 Jul 2012 00:02:45 +0000 (00:02 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 3 Jul 2012 00:02:45 +0000 (00:02 +0000)
commit98a7ca61fa905792bd3fdfa6c29f44691c9582ac
tree47455f2482f6eca0352c10c57482641eec6afb57
parent4e39a854b4589cddff484649d95cce4c71d4e9f4
parent2ed69a95f499081aacc15c0295f3461c38430554
Merged changes in the trunk up to revision 48505.
25 files changed:
source/blender/CMakeLists.txt
source/blender/SConscript
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/operators/bmo_utils.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/convertblender.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c