Merge with -r 22620:23107.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Fri, 11 Sep 2009 18:09:58 +0000 (18:09 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Fri, 11 Sep 2009 18:09:58 +0000 (18:09 +0000)
commit3b2ad838e8c628a468ee19ac77fb1336dd6072cf
treebc1e229f3055e4114086775122c7a47facb42679
parent7220792f187f91a2ef3eb0c930a13674b2a8a80a
parent15d77f17a40398a63f95e16607deb81257c02698
Merge with -r 22620:23107.

Next: update scripts and merge in 2.5.
37 files changed:
SConstruct
release/io/export_ply.py
release/ui/buttons_data_empty.py
release/ui/space_info.py
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/mesh.c
source/blender/editors/include/ED_mesh.h
source/blender/editors/mesh/editmesh_mods.c
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/intern/SConscript
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_action_api.c
source/blender/makesrna/intern/rna_animation_api.c
source/blender/makesrna/intern/rna_armature.c
source/blender/makesrna/intern/rna_image_api.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_material_api.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_pose_api.c
source/blender/makesrna/intern/rna_scene_api.c
source/blender/makesrna/intern/rna_test.c
source/blender/makesrna/intern/rna_ui_api.c
source/blender/python/intern/bpy_interface.c
source/blender/python/intern/bpy_rna.c
source/blender/python/intern/bpy_util.c
source/creator/SConscript
source/creator/creator.c
tools/Blender.py
tools/btools.py