Merged changes in the trunk up to revision 44221.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 18 Feb 2012 11:26:11 +0000 (11:26 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 18 Feb 2012 11:26:11 +0000 (11:26 +0000)
commit910f04ca6373510f463de2541576b479671dc2ef
tree544499dbbab4c371052e54cc1a32e7a60e64206a
parentf261d58b6dfd68ae936ed8b76c8399df7a34a071
parentf3bef40b0cf2a10bcffedae6c5235e3f5537670f
Merged changes in the trunk up to revision 44221.

Conflicts resolved:
release/datafiles/blender_icons.png
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenloader/intern/readfile.c
29 files changed:
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenlib/BLI_editVert.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/render/render_intern.h
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_material_types.h
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/rna_internal.h
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/include/render_types.h
source/blender/render/intern/source/shadeoutput.c
source/blender/windowmanager/WM_types.h
source/creator/CMakeLists.txt