git.blender.org - blender.git/commit

projects / blender.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 074f0de 8f3a529)

author	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Mon, 21 Dec 2009 22:38:06 +0000 (22:38 +0000)
committer	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Mon, 21 Dec 2009 22:38:06 +0000 (22:38 +0000)
commit	d0fa71a68e520ad9de86c8e544abaaea76ae06b2
tree	2c151ee2fd05a9123ce6574bb4470f9e09da384a	tree
parent	074f0de97088bb2588aebcf57d725f774e351210	commit \| diff
parent	8f3a529585186a8b0a3315d037ac374351c63221	commit \| diff

Merged changes in the trunk up to revision 25508.

17 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/blenloader/intern/writefile.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/editors/render/render_shading.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/screen/screen_ops.c	diff1 \|	diff2 \|	blob \| history
source/blender/freestyle/intern/application/AppConfig.cpp	diff1 \|	\|	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/SConscript	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/pipeline.c	diff1 \|	diff2 \|	blob \| history
source/creator/creator.c	diff1 \|	diff2 \|	blob \| history

The official Blender Foundation tree