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

projects / blender-staging.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4ec75ba 616af4f)

author	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Mon, 8 Feb 2010 21:13:33 +0000 (21:13 +0000)
committer	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Mon, 8 Feb 2010 21:13:33 +0000 (21:13 +0000)
commit	ed266e868cee7e922f028227ee22492d7e830253
tree	7eacd3765dbf381d8617f17e47c005165adc08ed	tree \| snapshot
parent	4ec75badf8a0ed6bb2b00b26947792ddc629a164	commit \| diff
parent	616af4fa52b4bdc3cbee3d6d1f17b5d1fb54a0b6	commit \| diff

Merged changes in the trunk up to revision 26719.

12 files changed:

release/scripts/ui/properties_render.py	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/SConscript	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/screen/screen_ops.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_scene_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/RNA_access.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_scene.c	diff1 \|	diff2 \|	blob \| history
source/blender/python/intern/bpy_interface.c	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