Tamito Kajiyama 63b31ef91b Merged changes in the trunk up to revision 35203. ...

Conflicts resolved:
source/creator/creator.c
source/blender/python/intern/bpy.c

2011-02-26 20:21:09 +00:00

..

bpy_app.c

doxygen: prevent GPL license block from being parsed as doxygen comment.

2011-02-23 10:52:22 +00:00

bpy_app.h

doxygen: prevent GPL license block from being parsed as doxygen comment.

2011-02-23 10:52:22 +00:00

bpy_driver.c

doxygen: prevent GPL license block from being parsed as doxygen comment.

2011-02-23 10:52:22 +00:00

bpy_driver.h

doxygen: prevent GPL license block from being parsed as doxygen comment.

2011-02-23 10:52:22 +00:00

bpy_interface.c

fix for 'live edit', running python scripts as you type

2011-02-26 15:30:38 +00:00

bpy_operator_wrap.c

python api renaming and added headers for some files which didnt have one, no functionality change.

2011-02-14 04:15:25 +00:00

bpy_operator_wrap.h

doxygen: some more license block fixes.

2011-02-23 23:22:25 +00:00

bpy_operator.c

- clear some warnings

2011-02-18 06:07:41 +00:00

bpy_operator.h

doxygen: some more license block fixes.

2011-02-23 23:22:25 +00:00

bpy_props.c

doxygen: prevent GPL license block from being parsed as doxygen comment.

2011-02-23 10:52:22 +00:00

bpy_props.h

doxygen: prevent GPL license block from being parsed as doxygen comment.

2011-02-23 10:52:22 +00:00

bpy_rna_array.c

fix [#26227] "Sequence must have 2 items total, not -2"

2011-02-26 12:26:01 +00:00

bpy_rna_callback.c

doxygen: prevent GPL license block from being parsed as doxygen comment.

2011-02-23 10:52:22 +00:00

bpy_rna_callback.h

doxygen: prevent GPL license block from being parsed as doxygen comment.

2011-02-23 10:52:22 +00:00

bpy_rna.c

found moving verts in pythons 2.5 api is approx 10x slower because the multi-dimensional array assignment reads the array 3 times (typecheck, length-check & for-real).

2011-02-24 08:47:58 +00:00

bpy_rna.h

py/rna api:

2011-02-23 13:43:45 +00:00

bpy_traceback.c

doxygen: prevent GPL license block from being parsed as doxygen comment.

2011-02-23 10:52:22 +00:00

bpy_traceback.h

doxygen: prevent GPL license block from being parsed as doxygen comment.

2011-02-23 10:52:22 +00:00

bpy_util.c

doxygen: prevent GPL license block from being parsed as doxygen comment.

2011-02-23 10:52:22 +00:00

bpy_util.h

doxygen: prevent GPL license block from being parsed as doxygen comment.

2011-02-23 10:52:22 +00:00

bpy.c

Merged changes in the trunk up to revision 35203.

2011-02-26 20:21:09 +00:00

bpy.h

doxygen: prevent GPL license block from being parsed as doxygen comment.

2011-02-23 10:52:22 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 35203.

2011-02-26 20:21:09 +00:00

stubs.c

doxygen: prevent GPL license block from being parsed as doxygen comment.

2011-02-23 10:52:22 +00:00