Merged changes in the trunk up to revision 44039.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 12 Feb 2012 00:09:48 +0000 (00:09 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 12 Feb 2012 00:09:48 +0000 (00:09 +0000)
commit5c5685f6c5bfc9a6c838aa837f1b5980127bcbc3
tree3be4711bfe8b23cecee40c0cb9d0c041b66e7c0f
parenteecfa9473c985024128567fda33f8fd19bbda7a8
parent24fc50907d811823c2d78fd03080376b0089c6e9
Merged changes in the trunk up to revision 44039.
13 files changed:
build_files/scons/tools/Blender.py
doc/python_api/sphinx_doc_gen.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/idcode.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/shadeoutput.c