Tamito Kajiyama
feccbaabbd
Merged changes in the trunk up to revision 53584.
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h
Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup
2013-01-05 22:24:05 +00:00
..
2012-12-27 07:27:28 +00:00
2012-02-23 05:20:09 +00:00
2012-11-28 15:07:57 +00:00
2012-11-27 13:54:34 +00:00
2012-11-27 13:54:34 +00:00
2012-06-26 21:40:01 +00:00
2012-11-29 03:25:37 +00:00
2012-03-21 05:33:37 +00:00
2012-11-21 02:28:36 +00:00
2012-05-01 06:50:43 +00:00
2012-11-29 03:25:37 +00:00
2012-03-16 05:03:13 +00:00
2012-12-20 07:57:26 +00:00
2012-11-29 03:25:37 +00:00
2012-12-19 11:18:08 +00:00
2012-02-23 05:20:09 +00:00
2012-11-27 13:45:28 +00:00