Merged changes in the trunk up to revision 50257.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 29 Aug 2012 00:53:29 +0000 (00:53 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 29 Aug 2012 00:53:29 +0000 (00:53 +0000)
commit141dd5233ede83a6d3882713c95bba47cee90a68
tree23cdf3e596bba784d101f9e32f234b399ffba4b1
parent22b30da565de53a0a1d34079d72b08fdb54ec8e3
parent8321acaf439b33cca0b054565be176047d289134
Merged changes in the trunk up to revision 50257.

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
31 files changed:
build_files/scons/tools/Blender.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/group.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
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/bmesh/operators/bmo_utils.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.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_userdef_types.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/python/intern/bpy.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
source/blender/render/intern/source/shadeoutput.c
source/blender/windowmanager/intern/wm_files.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c