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

..

bpy_app_build_options.c

Merged changes in the trunk up to revision 53584.

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

bpy_app_build_options.h

Adding "build_options" to bpy.app, a frozenset containing strings matching optional feature's build defines (like 'FFMPEG', 'MOD_BOOLEAN', 'INTERNATIONAL', etc.) for all enabled elements.

2012-12-18 18:02:20 +00:00

bpy_app_ffmpeg.c

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

bpy_app_ffmpeg.h

code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo too.

2012-10-09 13:36:42 +00:00

bpy_app_handlers.c

code cleanup: define sizes of vectors for function args and use C style comments

2012-10-15 09:11:17 +00:00

bpy_app_handlers.h

code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo too.

2012-10-09 13:36:42 +00:00

bpy_app.c

New command-line option --debug-freestyle to enable verbose debug messages

2013-01-03 23:27:20 +00:00

bpy_app.h

code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo too.

2012-10-09 13:36:42 +00:00

bpy_driver.c

code cleanup: define sizes of vectors for function args and use C style comments

2012-10-15 09:11:17 +00:00

bpy_driver.h

code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo too.

2012-10-09 13:36:42 +00:00

bpy_interface_atexit.c

quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.

2012-09-15 01:52:28 +00:00

bpy_interface.c

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

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

bpy_intern_string.c

avoid string -> unicode conversion when registering classes, also avoid unlikely but possible crash if the py-class returns new instances of PyObjects it doesnt own when registering the class.

2012-11-22 08:45:32 +00:00

bpy_intern_string.h

avoid string -> unicode conversion when registering classes, also avoid unlikely but possible crash if the py-class returns new instances of PyObjects it doesnt own when registering the class.

2012-11-22 08:45:32 +00:00

bpy_library.c

quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.

2012-09-15 01:52:28 +00:00

bpy_library.h

quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.

2012-09-15 01:52:28 +00:00

bpy_operator_wrap.c

style cleanup: py api

2012-03-26 20:41:54 +00:00

bpy_operator_wrap.h

unify include guard defines, __$FILENAME__

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

bpy_operator.c

style cleanup

2012-08-22 16:44:32 +00:00

bpy_operator.h

unify include guard defines, __$FILENAME__

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

bpy_path.c

commit bpy_path files, missed these in recent commit.

2013-01-04 07:58:47 +00:00

bpy_path.h

commit bpy_path files, missed these in recent commit.

2013-01-04 07:58:47 +00:00

bpy_props.c

Add a warning to enum props' items parameter, to *never* use a generator as value for this param! It works in most cases, but in some it leads to an empty set of values for the enum (see [#33716]), and it's not an easy bug to track down!

2013-01-01 15:55:21 +00:00

bpy_props.h

unify include guard defines, __$FILENAME__

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

bpy_rna_anim.c

fix [#33726] keyframe_insert() and keyframe_delete() with index=-1 always fail

2013-01-02 06:09:53 +00:00

bpy_rna_anim.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

bpy_rna_array.c

py api cleanup, replace use...

2012-11-21 02:28:36 +00:00

bpy_rna_callback.c

Change region drawing callbacks to work much closer to how blender manages them internally.

2012-12-20 13:29:58 +00:00

bpy_rna_callback.h

Change region drawing callbacks to work much closer to how blender manages them internally.

2012-12-20 13:29:58 +00:00

bpy_rna.c

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

bpy_rna.h

Change region drawing callbacks to work much closer to how blender manages them internally.

2012-12-20 13:29:58 +00:00

bpy_traceback.c

update parse_syntax_error() from python3.3 - this is an internal python function that isn't exposed to the api.

2012-12-04 20:09:07 +00:00

bpy_traceback.h

code cleanup: make header defines more consistent, JOYSENSOR header guard had a typo too.

2012-10-09 13:36:42 +00:00

bpy_util.c

Big i18n commit: add "reports" from bmesh/readfile/tracking/dynapaint (and a few others), and another bunch of UI messages tweaks/fixes, as well as some BKE_report()<->BKE_reportf()...

2012-10-26 17:32:50 +00:00

bpy_util.h

bump python requirement to 3.3

2012-12-06 02:42:42 +00:00

bpy.c

Merged changes in the trunk up to revision 53280.

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

bpy.h

quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.

2012-09-15 01:52:28 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 53584.

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

gpu.c

quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.

2012-09-15 01:52:28 +00:00

gpu.h

code cleanup: correct spelling

2012-09-28 06:45:20 +00:00

stubs.c

quiet -Wmissing-prototypes warnings, and enable this warning by default for C with gcc.

2012-09-15 01:52:28 +00:00