Merged changes in the trunk up to revision 48227.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 24 Jun 2012 10:29:26 +0000 (10:29 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 24 Jun 2012 10:29:26 +0000 (10:29 +0000)
commit1f7ae143a29b090ed97cdd7eb47a9c2dbd7f72a2
treefff560080a8bbf37ee087653df1b8a30173537b1
parentd38ba6b5d25ca42f76b6d1b746217a565f26228f
parent74c9c24d273863319a55c18234e03b7d27a43a87
Merged changes in the trunk up to revision 48227.

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_file/filelist.c
23 files changed:
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_buttons/space_buttons.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/transform/transform.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/blender/windowmanager/CMakeLists.txt
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c