Tamito Kajiyama 3b711a6ed0 Merged changes in the trunk up to revision 45133. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c

2012-03-25 08:20:19 +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

fix to possible bug running python callbacks - bpy.app.handlers.* to support handlers removing themselves from the list.

2012-03-20 20:37:40 +00:00

bpy_app_handlers.h

Code Cleanup: remove non existing function declarations.

2012-02-29 15:00:37 +00:00

bpy_app.c

fix for issue raise by patch [#30154] non utf8 buildinfo, fails to import 'bpy' module.

2012-03-04 03:14:38 +00:00

bpy_app.h

unify include guard defines, __$FILENAME__

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

bpy_driver.c

spelling cleanup

2012-03-18 07:38:51 +00:00

bpy_driver.h

unify include guard defines, __$FILENAME__

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

bpy_interface_atexit.c

spelling cleanup

2012-03-18 07:38:51 +00:00

bpy_interface.c

Adds support for utf paths on Windows.

2012-03-20 02:17:37 +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

spelling cleanup

2012-03-18 07:38:51 +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

spelling cleanup

2012-03-18 07:38:51 +00:00

bpy_operator.h

unify include guard defines, __$FILENAME__

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

bpy_props.c

spelling cleanup

2012-03-18 07:38:51 +00:00

bpy_props.h

unify include guard defines, __$FILENAME__

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

bpy_rna_anim.c

use LIKELY/UNLIKELY macros for operations that run a lot.

2012-02-26 23:59:08 +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

style cleanup: py/capi

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

bpy_rna_callback.c

spelling cleanup

2012-03-18 07:38:51 +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

style cleanup: follow style guide for formatting of if/for/while loops, and else if's

2012-03-24 06:24:53 +00:00

bpy_rna.h

use LIKELY/UNLIKELY macros for operations that run a lot.

2012-02-26 23:59:08 +00:00

bpy_traceback.c

style cleanup: py/capi

2012-03-16 21:39:56 +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 45133.

2012-03-25 08:20:19 +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

style cleanup: py/capi

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

gpu.h

style cleanup: py/capi

2012-03-16 21:39:56 +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