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

build_files

Merged changes in the trunk up to revision 53584.

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

doc

Merged changes in the trunk up to revision 53584.

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

extern

Merged changes in the trunk up to revision 53584.

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

release

Merged changes in the trunk up to revision 53584.

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

source

Merged changes in the trunk up to revision 53584.

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

CMakeLists.txt

Merged changes in the trunk up to revision 53584.

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

COPYING

== docs ==

2010-10-13 14:44:22 +00:00

GNUmakefile

code cleanup: comment unused members of bmesh operator slots and some osl style edits.

2012-11-20 14:31:58 +00:00

SConstruct

Merged changes in the trunk up to revision 53584.

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

Description

No description provided

926 MiB

Languages

C++ 78.1%

Python 15%

C 2.8%

GLSL 1.8%

CMake 1.2%

Other 0.9%