Merged changes in the trunk up to revision 43038.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 31 Dec 2011 21:09:26 +0000 (21:09 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 31 Dec 2011 21:09:26 +0000 (21:09 +0000)
commitcc3adc2202ce0208b1c95bc3fe3f0290b3b511f9
tree503d6bc4376b27a6efe73739609e9bbb1f1188cb
parent0896a227232f741b6028219a208ae60e78515406
parentb5595298d36a5023cc33ed41463fd6c032f2ec7b
Merged changes in the trunk up to revision 43038.

Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c
24 files changed:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/editmesh_mods.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/space_view3d/drawobject.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_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/intern/rna_scene.c
source/blender/python/SConscript
source/blender/python/intern/CMakeLists.txt
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