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

..

bmesh

Merged changes in the trunk up to revision 53584.

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

generic

expose common extensions for image/movie/audio types, since python scripts had to do this internally.

2013-01-04 03:47:37 +00:00

intern

Merged changes in the trunk up to revision 53584.

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

mathutils

replace MIN/MAX 3,4 with inline functions

2012-12-21 05:07:26 +00:00

BPY_extern.h

fix [#31661] Custom properties do no respect min/max values

2012-10-26 10:54:02 +00:00

CMakeLists.txt

initial bmesh python api.

2012-02-22 09:19:53 +00:00

rna_dump.py

style cleanup: pep8

2012-10-08 10:03:01 +00:00

SConscript

Merged changes in the trunk up to revision 53584.

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

simple_enum_gen.py

style cleanup: py/capi

2012-03-16 21:39:56 +00:00