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

projects / blender-staging.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 98a7ca6 3a0593c)

author	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Fri, 6 Jul 2012 23:46:48 +0000 (23:46 +0000)
committer	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Fri, 6 Jul 2012 23:46:48 +0000 (23:46 +0000)
commit	b7b50298148ef502d14143b0a5fa01dfac2ecce4
tree	7c47cc7777b79bb375bc2f939c34233e6671e10d	tree
parent	98a7ca61fa905792bd3fdfa6c29f44691c9582ac	commit \| diff
parent	3a0593cc3d5de33248b3a7b913a45729c37dc1b4	commit \| diff

Merged changes in the trunk up to revision 48695.

17 files changed:

release/scripts/startup/bl_ui/space_view3d.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/anim_sys.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/material.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/object.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/mesh/editmesh_tools.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/transform/transform.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_action_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_mesh.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_scene.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_userdef.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/render_result.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/shadeoutput.c	diff1 \|	diff2 \|	blob \| history
source/creator/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history

Repository to test new patches