This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.

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

..

CMakeLists.txt

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

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

interface_anim.c

Code cleanup - whitespace

2012-08-08 14:02:44 +00:00

interface_draw.c

Holiday coding log :)

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

interface_handlers.c

Fixes - post 2.65a

2013-01-04 14:51:02 +00:00

interface_icons.c

code cleanup: warnings

2013-01-04 02:13:29 +00:00

interface_intern.h

Further trackpad work:

2013-01-01 16:42:35 +00:00

interface_layout.c

style cleanup: var naming for ui list

2012-12-28 10:32:49 +00:00

interface_ops.c

change uiButGetStrInfo() to use a trailing NULL arg rather then passing the number of args as an arg.

2012-12-02 04:51:15 +00:00

interface_panel.c

Region scrollbar fix!

2012-12-26 13:05:39 +00:00

interface_regions.c

Further trackpad work:

2013-01-01 16:42:35 +00:00

interface_style.c

minor edits

2012-12-13 02:40:49 +00:00

interface_templates.c

Merged changes in the trunk up to revision 53584.

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

interface_utils.c

make sure color picker and color swatch buttons have rnaindex of -1.

2012-12-18 17:00:49 +00:00

interface_widgets.c

fix bad left aligned text when zoomed out.

2013-01-03 15:52:31 +00:00

interface.c

Region scrollbar fix!

2012-12-26 13:05:39 +00:00

resources.c

Merged changes in the trunk up to revision 53584.

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

SConscript

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

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

view2d_ops.c

Trackpad fixes & changes:

2012-12-29 13:21:01 +00:00

view2d.c

Region scrollbar fix!

2012-12-26 13:05:39 +00:00