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

..

intern

Merged changes in the trunk up to revision 53584.

2013-01-05 22:24:05 +00:00

CMakeLists.txt

Another big patch set by Bastien Montagne, thanks a lot!

2012-12-20 07:57:26 +00:00

SConscript

Another big patch set by Bastien Montagne, thanks a lot!

2012-12-20 07:57:26 +00:00

WM_api.h

This commit frees list ui items from their dependencies to Panel, and hence from all the limitations this implied (mostly, the "only one list per panel" one).

2012-12-28 09:20:16 +00:00

wm_cursors.h

style cleanup: mostly whitespace in rna

2012-05-12 11:01:29 +00:00

wm_draw.h

unify include guard defines, __$FILENAME__

2012-02-17 18:59:41 +00:00

wm_event_system.h

Holiday coding log :)

2012-12-12 18:58:11 +00:00

wm_event_types.h

code cleanup: name event -> event_type in macros, since this is from event->type

2012-12-31 17:39:01 +00:00

wm_files.h

Holiday coding log :)

2012-12-12 18:58:11 +00:00

WM_keymap.h

all remove functions now invalidate the RNA objects passed, to help script authors to avoid bugs with accessing removed data.

2012-11-02 09:41:26 +00:00

wm_subwindow.h

define the size of matrix args for both rows/cols.

2012-12-11 14:29:01 +00:00

WM_types.h

Merged changes in the trunk up to revision 53280.

2012-12-23 00:23:11 +00:00

wm_window.h

Holiday coding log :)

2012-12-12 18:58:11 +00:00

wm.h

Code Cleanup: remove non existing function declarations.

2012-02-29 15:00:37 +00:00