Merged changes in the trunk up to revision 43585.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 21 Jan 2012 23:01:25 +0000 (23:01 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 21 Jan 2012 23:01:25 +0000 (23:01 +0000)
commit68ae82bb479a79de72cf174763f3244f64e28bb0
tree159f1f1a8211ff2d2d89a80f94739cc0f0dfe696
parent3667cddf1ada28b6964bc9beeb7cce31f04e18a8
parentb95beea539b22baeb68013c4e65fb0455b968890
Merged changes in the trunk up to revision 43585.

Conflicts resolved:
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
29 files changed:
build_files/scons/tools/Blender.py
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/CMakeLists.txt
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c