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 68ae82bb47 Merged changes in the trunk up to revision 43585. ...

Conflicts resolved:
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c

2012-01-21 23:01:25 +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

Add FFmpeg libraries versions to system-info.txt

2011-12-28 12:35:58 +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

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

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

bpy_app.c

Add FFmpeg libraries versions to system-info.txt

2011-12-28 12:35:58 +00:00

bpy_app.h

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

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

bpy_driver.c

formatting edits only to use more consisted style

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

bpy_driver.h

pydrivers: 'frame' is now in the driver namespace,

2011-11-17 07:08:09 +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

formatting edits only to use more consisted style

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

bpy_operator_wrap.h

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

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

bpy_operator.c

formatting edits only to use more consisted style

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

bpy_operator.h

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

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

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

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

fix [#27589] Random crash with python UI

2012-01-18 19:50:44 +00:00

bpy_rna.h

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

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

bpy_traceback.c

formatting edits only to use more consisted style

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

bpy_traceback.h

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

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

bpy_util.c

formatting edits only to use more consisted style

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

bpy_util.h

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

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

split some >120 lines, no functional changes

2011-12-21 22:56:06 +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