Merged changes in the trunk up to revision 43404.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 15 Jan 2012 23:13:12 +0000 (23:13 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 15 Jan 2012 23:13:12 +0000 (23:13 +0000)
commite0df491d1e465588cc018c6f6d00f72739b71516
treefe4cbcdaa4633545bbc817c28eb780b551e5ac05
parent76a211d80947a453f594e4cf0a1e0acc6786eddf
parent23806a2b7d50082d70a0e4ecab22aafb8433708a
Merged changes in the trunk up to revision 43404.

Conflicts resolved:
source/blender/python/SConscript
36 files changed:
release/scripts/startup/bl_ui/properties_render.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/BLI_editVert.h
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_material_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/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/python/SConscript
source/blender/python/intern/CMakeLists.txt
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeoutput.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt