Merge from 2.5 -r 21285:21515. Thanks Joshua!
authorArystanbek Dyussenov <arystan.d@gmail.com>
Sat, 11 Jul 2009 09:14:12 +0000 (09:14 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Sat, 11 Jul 2009 09:14:12 +0000 (09:14 +0000)
commit3ad64726eeb358ce4358df7942315578c0472124
tree03e737932655110391dc7d02e4d002729ccdbf30
parent797c6a2295f47f1c3a71f9094c710316cdf2ecf3
parenta7287165dbd4d0fbbe446a7bb71fd2b947bcf4f8
Merge from 2.5 -r 21285:21515. Thanks Joshua!
12 files changed:
release/io/export_obj.py
release/ui/buttons_world.py
source/blender/blenkernel/intern/image.c
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_object.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