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
..
2013-01-05 22:24:05 +00:00
2013-01-02 16:15:45 +00:00
2012-12-28 13:34:19 +00:00
2012-10-08 08:28:05 +00:00
2012-10-08 08:28:05 +00:00
2012-12-11 22:00:22 +00:00
2012-12-09 14:17:33 +00:00
2012-10-08 08:28:05 +00:00
2012-12-29 08:46:27 +00:00
2012-07-03 09:02:41 +00:00
2012-10-10 13:18:07 +00:00
2012-07-04 15:52:07 +00:00
2012-11-20 01:26:42 +00:00
2012-11-18 03:01:31 +00:00
2012-11-17 01:15:28 +00:00
2012-07-03 09:02:41 +00:00
2013-01-04 07:57:33 +00:00
2012-11-28 06:43:04 +00:00
2012-11-28 06:43:04 +00:00
2013-01-03 07:01:41 +00:00
2012-04-14 05:09:23 +00:00
2012-12-15 16:27:12 +00:00