Merge with 2.5 -r 22173:22620.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Wed, 19 Aug 2009 09:04:49 +0000 (09:04 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Wed, 19 Aug 2009 09:04:49 +0000 (09:04 +0000)
commit7c786e28c4965fc7314d7a2a3521f41f9b562726
tree68fc6352398e2fb1dba9bf0272e985abf9d176a0
parent09042ce9a507b7f9ea36a63e60bbda6266541579
parent680f88017fda17582ac5b4c7e1b3afecbb56b2f8
Merge with 2.5 -r 22173:22620.
26 files changed:
SConstruct
config/linuxcross-config.py
release/io/export_fbx.py
release/ui/buttons_data_empty.py
release/ui/space_info.py
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/image.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_image.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_object.c
source/blender/makesrna/intern/rna_pose.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy_interface.c
source/blender/python/intern/bpy_rna.c
source/blender/python/intern/bpy_util.c
source/creator/creator.c
tools/Blender.py
tools/btools.py