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 d433cd65f7 Merged changes in the trunk up to revision 53146. ...

Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c

2012-12-19 01:49:58 +00:00

..

bpy_app_build_options.c

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_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

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.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

fix for python button evaluation not restoring the __main__ module.

2012-12-04 19:58:13 +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_props.c

when an invalid subtype is passed to a property, a list of valid subtypes is now included in the exception message.

2012-10-30 12:45:42 +00:00

bpy_props.h

unify include guard defines, __$FILENAME__

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

bpy_rna_anim.c

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +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

Fix cosmetic typos

2012-05-15 16:11:04 +00:00

bpy_rna_callback.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.c

missed adding show_grease_pencil to node space in recent commit

2012-12-17 09:17:21 +00:00

bpy_rna.h

fix for crash when a python operator or render engine was freed in the C code and then referenced from python.

2012-10-26 10:33:57 +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 53146.

2012-12-19 01:49:58 +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 53146.

2012-12-19 01:49:58 +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