Merge from 2.5 r20855 through r20966
authorArystanbek Dyussenov <arystan.d@gmail.com>
Thu, 18 Jun 2009 11:42:30 +0000 (11:42 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Thu, 18 Jun 2009 11:42:30 +0000 (11:42 +0000)
commit8bafa1985317464954bad1b1ed78c8bc6a9969d9
treef9a36f56d371f377ce309699503a2fee3a613609
parent29f5694ab8d2021bb0b9c197f95b228809b40897
parent7e57823c47761383a458665e923bb189e489c1f4
Merge from 2.5 r20855 through r20966

Build fails: http://www.pasteall.org/6201/text
23 files changed:
release/scripts/export_obj-2.5.py
source/blender/editors/mesh/editmesh.c
source/blender/makesrna/RNA_define.h
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_context.c
source/blender/makesrna/intern/rna_curve.c
source/blender/makesrna/intern/rna_define.c
source/blender/makesrna/intern/rna_internal_types.h
source/blender/makesrna/intern/rna_key.c
source/blender/makesrna/intern/rna_lattice.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_rna.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_sequence.c
source/blender/python/intern/bpy_operator_wrap.c
source/blender/python/intern/bpy_rna.c
source/blender/python/intern/bpy_util.c