Merge with 2.5 -r 21756:22173.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Mon, 3 Aug 2009 14:06:47 +0000 (14:06 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Mon, 3 Aug 2009 14:06:47 +0000 (14:06 +0000)
commit2065c5cf605ea6147cb4097cf4aca7ac003a1ba1
tree19d0ff6a5eada1458c86390fe10e20c322a8c2fd
parent4086ca58e275816a49950f6ac0cbffa6cb36a8ad
parent28909178d96ff04c22091ccd992314617352e1f0
Merge with 2.5 -r 21756:22173.
25 files changed:
config/linuxcross-config.py
release/io/export_fbx.py
release/io/export_ply.py
release/scripts/export_fbx.py
release/ui/buttons_data_empty.py
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/mesh.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_armature.c
source/blender/makesrna/intern/rna_define.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_mesh_api.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_pose.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy_interface.c
source/creator/creator.c
tools/Blender.py