Merged changes in the trunk up to revision 31499.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 21 Aug 2010 17:05:07 +0000 (17:05 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 21 Aug 2010 17:05:07 +0000 (17:05 +0000)
1  2 
release/scripts/ui/properties_render.py
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_scene.c

Simple merge
Simple merge