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 55015daa43 Merged changes in the trunk up to revision 51448. ...

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesrna/intern/rna_main_api.c

2012-10-20 16:48:48 +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

code cleanup: rename G.rt to G.debug_value

2012-08-08 18:21:54 +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

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

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

bpy_intern_string.c

formatting edits only to use more consisted style

2011-12-26 12:26:11 +00:00

bpy_intern_string.h

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

2011-10-23 17:52:20 +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

add warning that RNA update callbacks dont have checks for infinite recursion.

2012-09-28 09:35:32 +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

code cleanup: spelling

2012-07-16 23:23:33 +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

code cleanup: correct spelling

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

bpy_rna.h

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

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

bpy_traceback.c

fix for finding the python exception line number when running a script in the text editor.

2012-03-30 05:26:08 +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

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

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

bpy_util.h

Python/context: python could get invalid bpy.data in scene update handler after

2012-05-08 22:07:06 +00:00

bpy.c

Merged changes in the trunk up to revision 50956.

2012-09-30 13:16:55 +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 51448.

2012-10-20 16:48:48 +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