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

author	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Mon, 5 Dec 2011 02:12:49 +0000 (02:12 +0000)
committer	Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
	Mon, 5 Dec 2011 02:12:49 +0000 (02:12 +0000)
commit	3197796cf7aa4f1c34f2e68a2eca9d6a412a51d0
tree	5a0a119149b1079f888178bc2df3d15950c2f9b9	tree
parent	43c5e1b58030322096770b1aa4d91077793cd2c4	commit \| diff
parent	eb233d933223a3795f3ff5204c4412f7a0fd6782	commit \| diff

Merged changes in the trunk up to revision 42425.

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c

37 files changed:

build_files/scons/tools/Blender.py	diff1 \|	diff2 \|	blob \| history
doc/python_api/sphinx_doc_gen.py	diff1 \|	diff2 \|	blob \| history
release/scripts/startup/bl_ui/space_view3d.py	diff1 \|	diff2 \|	blob \| history
source/blender/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/cdderivedmesh.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/editderivedmesh.c	\|	diff2 \|	blob \| history
source/blender/blenkernel/intern/group.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/library.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/blenkernel/intern/scene.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/subsurf_ccg.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenlib/intern/bpath.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/include/UI_resources.h	diff1 \|	diff2 \|	blob \| history
source/blender/editors/interface/interface_templates.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/interface/resources.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/mesh/editmesh.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/mesh/editmesh_mods.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/mesh/editmesh_tools.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_view3d/drawobject.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_action_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_material_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_mesh_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_meshdata_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_scene_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_userdef_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/intern/makesdna.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/RNA_access.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/makesrna.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_userdef.c	diff1 \|	diff2 \|	blob \| history
source/blender/python/intern/bpy.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/include/render_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/convertblender.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/pipeline.c	diff1 \|	diff2 \|	blob \| history

Repository to test new patches

RSS Atom

build_files/scons/tools/Blender.py	diff1 \|	diff2 \|	blob \| history
doc/python_api/sphinx_doc_gen.py	diff1 \|	diff2 \|	blob \| history
release/scripts/startup/bl_ui/space_view3d.py	diff1 \|	diff2 \|	blob \| history
source/blender/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/cdderivedmesh.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/editderivedmesh.c	\|	diff2 \|	blob \| history
source/blender/blenkernel/intern/group.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/library.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/blenkernel/intern/scene.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/subsurf_ccg.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenlib/intern/bpath.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/include/UI_resources.h	diff1 \|	diff2 \|	blob \| history
source/blender/editors/interface/interface_templates.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/interface/resources.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/mesh/editmesh.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/mesh/editmesh_mods.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/mesh/editmesh_tools.c	diff1 \|	diff2 \|	blob \| history
source/blender/editors/space_view3d/drawobject.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_action_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_material_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_mesh_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_meshdata_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_scene_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/DNA_userdef_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesdna/intern/makesdna.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/RNA_access.h	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/makesrna.c	diff1 \|	diff2 \|	blob \| history
source/blender/makesrna/intern/rna_userdef.c	diff1 \|	diff2 \|	blob \| history
source/blender/python/intern/bpy.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/include/render_types.h	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/convertblender.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/pipeline.c	diff1 \|	diff2 \|	blob \| history