Merged changes in the trunk up to revision 38893.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 1 Aug 2011 20:18:02 +0000 (20:18 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 1 Aug 2011 20:18:02 +0000 (20:18 +0000)
commit9a0b816416595d7677a1f7ad4f7ac3668e56eb22
tree5f0cbea93b4a5bb807acabc7ccf85327ef537182
parent46db54c8059aa86cef25c7ceddb1c104585614fc
parentc965d1d2ccfd57926476cb5c091afa35c6de217f
Merged changes in the trunk up to revision 38893.
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/material.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_scene.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c