Tamito Kajiyama 0ec378f3fe Merged changes in the trunk up to revision 34193. ...

Conflicts resolved:
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.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_channels.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c

API changes resolved:
source/blender/freestyle/intern/system/PythonInterpreter.h

2011-01-09 15:07:14 +00:00

..

bpy_app.c

remove references to BKE_utildefines where its not needed.

2011-01-07 19:18:31 +00:00

bpy_app.h

python access to driver namespace, rather then have a textblock defined for drivers allow scripts to add functions directly.

2010-11-27 02:39:51 +00:00

bpy_driver.c

edits for BPY_extern.h functions, no functional changes

2011-01-05 02:08:54 +00:00

bpy_interface.c

remove references to BKE_utildefines where its not needed.

2011-01-07 19:18:31 +00:00

bpy_operator_wrap.c

split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h.

2011-01-07 18:36:47 +00:00

bpy_operator_wrap.h

correct fsf address

2010-02-12 13:34:04 +00:00

bpy_operator.c

split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h.

2011-01-07 18:36:47 +00:00

bpy_operator.h

correct fsf address

2010-02-12 13:34:04 +00:00

bpy_props.c

remove references to BKE_utildefines where its not needed.

2011-01-07 19:18:31 +00:00

bpy_props.h

remove class methods for defining properties

2010-09-09 06:29:44 +00:00

bpy_rna_array.c

- correct typos in comments.

2011-01-02 11:06:50 +00:00

bpy_rna_callback.c

remove references to BKE_utildefines where its not needed.

2011-01-07 19:18:31 +00:00

bpy_rna_callback.h

Fix syntax for ID keyword.

2010-03-21 01:14:04 +00:00

bpy_rna.c

quiet zombie python class warning. bug remains but its not useful to print out so many errors when this wont be fixed for a while.

2011-01-09 11:54:12 +00:00

bpy_rna.h

UNUSED() macro so -Wunused-parameter can be used with GCC without so many warnings.

2010-10-13 23:25:08 +00:00

bpy_util.c

update python api with changes from Joshua's commit r33917. translate reports into python errors.

2010-12-31 05:40:30 +00:00

bpy_util.h

update python api with changes from Joshua's commit r33917. translate reports into python errors.

2010-12-31 05:40:30 +00:00

bpy.c

Merged changes in the trunk up to revision 34193.

2011-01-09 15:07:14 +00:00

bpy.h

SVN maintenance.

2010-09-03 03:30:20 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 34010.

2011-01-02 18:34:32 +00:00

Makefile

Added missing include for audio stuff.

2010-08-16 15:54:58 +00:00

stubs.c

edits for BPY_extern.h functions, no functional changes

2011-01-05 02:08:54 +00:00