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 7db432d29d Merged changes in the trunk up to revision 39826. ...

Made a major amount of conflict resolution for code adaptation to
the animation system updates introduced in the Pepper branch recently
merged to the trunk.

Resolved conflicts:
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_channels.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_main_api.c

2011-09-03 20:48:43 +00:00

..

bpy_app_handlers.c

patch [#28218] During-render callback functionality

2011-08-31 10:43:22 +00:00

bpy_app_handlers.h

SVN maintenance.

2011-06-24 23:14:26 +00:00

bpy_app.c

own patch [#27752] Python Callback (Scriptlink functionality)

2011-06-24 16:54:30 +00:00

bpy_app.h

mathutils support for color arithmetic, also some minor whitespace edits.

2011-06-02 08:29:16 +00:00

bpy_driver.c

fix [#28114] Render Crash

2011-08-04 01:56:36 +00:00

bpy_driver.h

doxygen: blender/python tagged.

2011-02-27 20:10:08 +00:00

bpy_interface.c

fix for crash when loading a file from a script, and executing user modules in the newly loaded file.

2011-08-20 13:29:42 +00:00

bpy_intern_string.c

typo fix: end of lines ;; --> ;

2011-08-31 01:07:55 +00:00

bpy_intern_string.h

SVN maintenance.

2011-06-18 23:22:55 +00:00

bpy_library.c

change BLO_library_append_begin to take a main argument rather then a context, means the BGE doesnt need to make a new empty context just to pass as an arg.

2011-08-05 05:26:19 +00:00

bpy_operator_wrap.c

minor cleanup, no functional changes.

2011-05-09 14:41:44 +00:00

bpy_operator_wrap.h

doxygen: blender/python tagged.

2011-02-27 20:10:08 +00:00

bpy_operator.c

file-selector: when converting operator arguments to the file selector, wasnt making paths absolute (abs paths are made relative when converting the other way).

2011-08-26 01:32:07 +00:00

bpy_operator.h

doxygen: blender/python tagged.

2011-02-27 20:10:08 +00:00

bpy_props.c

- use static vars and functions where possible.

2011-08-28 05:06:30 +00:00

bpy_props.h

mathutils support for color arithmetic, also some minor whitespace edits.

2011-06-02 08:29:16 +00:00

bpy_rna_anim.c

add in asserts for when array/non array RNA funcions are used incorrectly, would have made previous fix a lot easier to find.

2011-08-14 10:28:18 +00:00

bpy_rna_anim.h

SVN maintenance.

2011-03-02 05:06:43 +00:00

bpy_rna_array.c

fix [#28196] Unwrap tris in lightmap pack

2011-08-09 20:00:53 +00:00

bpy_rna_callback.c

C, style changes (mostly white space edits), no functional change.

2011-03-19 11:12:48 +00:00

bpy_rna_callback.h

doxygen: blender/python tagged.

2011-02-27 20:10:08 +00:00

bpy_rna.c

Fixes for snprintf usage:

2011-08-30 10:07:50 +00:00

bpy_rna.h

ifdef out support for for python owning and freeing BPy_StructRNA because this is only used for doc generation and it makes _every_ blender/python instance 4 bytes bigger - vertex/bezier point/object/scene/group etc.

2011-08-05 16:29:38 +00:00

bpy_traceback.c

fix for crash when running a python script in a non utf8 blend path, inspecting the exception for the path assumed utf8.

2011-08-26 17:55:03 +00:00

bpy_traceback.h

doxygen: blender/python tagged.

2011-02-27 20:10:08 +00:00

bpy_util.c

IDProperty python module update

2011-06-17 05:45:46 +00:00

bpy_util.h

fix for crash when loading a file from a script, and executing user modules in the newly loaded file.

2011-08-20 13:29:42 +00:00

bpy.c

Merged changes in the trunk up to revision 38543.

2011-07-20 23:33:10 +00:00

bpy.h

mathutils support for color arithmetic, also some minor whitespace edits.

2011-06-02 08:29:16 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 38543.

2011-07-20 23:33:10 +00:00

stubs.c

doxygen: blender/python tagged.

2011-02-27 20:10:08 +00:00