This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Tamito Kajiyama bb1f8d9586 Merged changes in the trunk up to revision 46309. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c

2012-05-05 11:40:42 +00:00

..

bpy_app_ffmpeg.c

style cleanup: py api

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

bpy_app_ffmpeg.h

unify include guard defines, __$FILENAME__

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

bpy_app_handlers.c

code cleanup: function naming for BLI functions.

2012-05-05 00:23:55 +00:00

bpy_app_handlers.h

Code Cleanup: remove non existing function declarations.

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

bpy_app.c

move debug flag into its own global var (G.debug), split up debug options.

2012-03-31 00:59:17 +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

style cleanup: comments

2012-04-22 11:54:53 +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

style cleanup: py api

2012-03-26 20:41:54 +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: py api

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

bpy_operator.h

unify include guard defines, __$FILENAME__

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

bpy_props.c

Patch [#31279] clarifiy a python error-string (when incorrectly specifying enum

2012-05-04 14:34:10 +00:00

bpy_props.h

unify include guard defines, __$FILENAME__

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

bpy_rna_anim.c

style cleanup: py api

2012-03-26 20:41:54 +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

move debug flag into its own global var (G.debug), split up debug options.

2012-03-31 00:59:17 +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

bmesh py api:

2012-05-01 06:50:43 +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

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

unify include guard defines, __$FILENAME__

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

bpy_util.c

style cleanup: py api

2012-03-26 20:41:54 +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 46309.

2012-05-05 11:40:42 +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 api

2012-03-26 20:41:54 +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