git.blender.org - blender.git/commit

projects / blender.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 65b2ef5 687c752)

author	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Sun, 4 Apr 2010 19:50:22 +0000 (19:50 +0000)
committer	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Sun, 4 Apr 2010 19:50:22 +0000 (19:50 +0000)
commit	f9e2f6acd761492c52500bf72e32a4ad5a33757b
tree	df44ac89101bf0be263a8d53623c9302dca5e59c	tree
parent	65b2ef5b15ae56758f7097df98dbce9ba3fe1454	commit \| diff
parent	687c752b75bc488b2de5a4186ba2398b31dbb46e	commit \| diff

Merged changes in the trunk up to revision 27992.

15 files changed:

release/scripts/ui/properties_render.py	diff1 \|	diff2 \|	blob \| history
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/blenloader/intern/writefile.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/render/render_intern.h	diff1 \|	diff2 \|	blob \| history
source/blender/editors/render/render_ops.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/render/render_shading.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_view3d/view3d_edit.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/transform/transform.c	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/render/extern/include/RE_pipeline.h	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/pipeline.c	diff1 \|	diff2 \|	blob \| history

The official Blender Foundation tree