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
2012-10-04 11:05:48 +00:00
2012-12-28 09:20:16 +00:00
2012-12-21 12:17:30 +00:00
2012-12-31 14:52:55 +00:00
2012-11-08 08:16:44 +00:00
2011-09-21 15:18:38 +00:00
2012-10-30 01:59:15 +00:00
2011-09-15 13:20:18 +00:00
2012-12-28 10:45:59 +00:00
2011-09-21 15:18:38 +00:00
2013-01-02 16:03:58 +00:00
2012-07-29 12:07:06 +00:00
2012-12-24 03:13:53 +00:00
2012-12-28 10:45:59 +00:00
2012-12-28 10:45:59 +00:00
2012-11-24 00:18:34 +00:00
2012-10-08 08:28:05 +00:00
2012-05-15 04:50:47 +00:00
2012-12-28 09:20:16 +00:00
2012-12-18 15:44:04 +00:00
2012-12-28 09:20:16 +00:00
2012-12-28 10:45:59 +00:00
2012-10-10 13:18:07 +00:00
2012-07-04 15:52:07 +00:00
2012-10-10 13:18:07 +00:00
2012-10-10 13:18:07 +00:00
2013-01-05 22:24:05 +00:00
2013-01-05 22:24:05 +00:00
2012-12-31 13:52:13 +00:00
2012-12-31 13:52:13 +00:00
2012-07-29 12:07:06 +00:00
2012-12-28 10:45:59 +00:00
2012-12-09 05:18:56 +00:00
2012-11-20 02:03:20 +00:00
2012-10-27 18:31:52 +00:00
2012-11-20 02:03:20 +00:00
2012-12-03 12:03:16 +00:00
2012-12-09 10:48:18 +00:00
2012-11-04 18:26:30 +00:00
2012-04-04 14:39:52 +00:00
2012-11-04 00:46:26 +00:00
2011-09-15 13:20:18 +00:00
2013-01-02 16:15:45 +00:00
2012-12-31 15:11:36 +00:00
2012-11-04 18:26:30 +00:00
2012-10-31 11:31:25 +00:00
2013-01-04 04:43:49 +00:00
2013-01-02 20:51:47 +00:00
2013-01-05 22:24:05 +00:00