git.blender.org - blender-staging.git/commit

projects / blender-staging.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 30da80c 40bf37e)

author	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Tue, 17 Aug 2010 07:10:03 +0000 (07:10 +0000)
committer	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Tue, 17 Aug 2010 07:10:03 +0000 (07:10 +0000)
commit	92478de0eb1077666ee20976853a984d52ac6e45
tree	2c023dffd5cada4f3c1de1d0e707e6d88e4414ed	tree \| snapshot
parent	30da80cc41dcd401428e99de85b14c0b4393090b	commit \| diff
parent	40bf37e3b661cf7675cbd578391c379332522c40	commit \| diff

Merged changes in the trunk up to revision 31403.

15 files changed:

release/scripts/ui/space_userpref.py	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/material.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/scene.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenloader/intern/readfile.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/interface/interface_templates.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_outliner/outliner.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_scene_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_scene.c	diff1 \|	diff2 \|	blob \| history
source/blender/python/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/python/SConscript	diff1 \|	diff2 \|	blob \| history
source/blender/python/doc/sphinx_doc_gen.py	diff1 \|	diff2 \|	blob \| history
source/blender/python/intern/bpy.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/extern/include/RE_pipeline.h	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/pipeline.c	diff1 \|	diff2 \|	blob \| history
source/creator/creator.c	diff1 \|	diff2 \|	blob \| history

Repository to test new patches