Merge with 2.5 -r 21515:21619.
authorArystanbek Dyussenov <arystan.d@gmail.com>
Thu, 16 Jul 2009 09:09:38 +0000 (09:09 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Thu, 16 Jul 2009 09:09:38 +0000 (09:09 +0000)
commitd381a668be8cda3e38bc16d162fce74a15acc39d
treef988527755d803f0059d2f967d86b7aa2697fdb4
parent73ad2d320cca8c34d7901630dd8c6223ba4cd4a3
parent88e3e8c1c939ee25f9d86fcfb1d55c0ab415373e
Merge with 2.5 -r 21515:21619.
16 files changed:
source/blender/blenkernel/intern/image.c
source/blender/makesdna/DNA_object_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_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_operator_wrap.c
source/blender/python/intern/bpy_rna.c
source/blender/python/intern/bpy_util.c