Tamito Kajiyama 9f243d531c Merged changes in the trunk up to revision 44288. ...

Conflicts resolved:
source/blender/blenkernel/intern/cdderivedmesh.c

2012-02-21 02:19:54 +00:00

..

bpy_app_ffmpeg.c

WIP loading bmesh in trunk, some conversion functions for this purpose.

2011-12-28 13:50:33 +00:00

bpy_app_ffmpeg.h

unify include guard defines, __$FILENAME__

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

bpy_app_handlers.c

formatting edits only to use more consisted style

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

bpy_app_handlers.h

unify include guard defines, __$FILENAME__

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

bpy_app.c

patch [#30227] Various MSVC (32-bit) Warning and Typo Fixes

2012-02-17 19:21:47 +00:00

bpy_app.h

unify include guard defines, __$FILENAME__

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

bpy_driver.c

formatting edits only to use more consisted style

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

bpy_driver.h

unify include guard defines, __$FILENAME__

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

bpy_interface_atexit.c

formatting edits only to use more consisted style

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

bpy_interface.c

fix for segfault with bpy compiled as python module (dont register atexit)

2012-01-17 15:19:11 +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

formatting edits only to use more consisted style

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

bpy_operator_wrap.c

Code Cleanup: line length and use Py_ssize_t for PyC_AsArray utility function.

2012-02-05 02:04:26 +00:00

bpy_operator_wrap.h

unify include guard defines, __$FILENAME__

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

bpy_operator.c

formatting edits only to use more consisted style

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

bpy_operator.h

unify include guard defines, __$FILENAME__

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

bpy_props.c

formatting edits (<120 line length), remove invalid 'defaults' keyword arg from docs.

2012-01-21 10:27:24 +00:00

bpy_props.h

unify include guard defines, __$FILENAME__

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

bpy_rna_anim.c

formatting edits only to use more consisted style

2011-12-26 12:26:11 +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

formatting edits only to use more consisted style

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

bpy_rna_callback.c

formatting edits only to use more consisted style

2011-12-26 12:26:11 +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: line length and use Py_ssize_t for PyC_AsArray utility function.

2012-02-05 02:04:26 +00:00

bpy_rna.h

unify include guard defines, __$FILENAME__

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

bpy_traceback.c

formatting edits only to use more consisted style

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

bpy_traceback.h

unify include guard defines, __$FILENAME__

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

bpy_util.c

formatting edits only to use more consisted style

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

bpy_util.h

unify include guard defines, __$FILENAME__

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

bpy.c

Merged changes in the trunk up to revision 42902.

2011-12-27 22:12:46 +00:00

bpy.h

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

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

CMakeLists.txt

Merged changes in the trunk up to revision 43404.

2012-01-15 23:13:12 +00:00

gpu.c

fix for leak in gpu.export_shader(), wasnt freeing the function.

2012-02-20 22:04:29 +00:00

gpu.h

remove header text:

2011-11-29 10:54:47 +00:00

stubs.c

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

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