Tamito Kajiyama ce03ec4b86 Merged changes in the trunk up to revision 38543. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt

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

..

bpy_app_handlers.c

SVN maintenance.

2011-06-24 23:14:26 +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 [#27683] Blender hangs when baking a particle system when a driver is present

2011-07-09 17:41:39 +00:00

bpy_driver.h

doxygen: blender/python tagged.

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

bpy_interface.c

move mathutils into its own lib.

2011-07-15 04:01:47 +00:00

bpy_intern_string.c

SVN maintenance.

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

bpy_intern_string.h

SVN maintenance.

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

bpy_library.c

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

2011-06-02 08:29:16 +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

remove some duplicate declarations

2011-05-10 14:48:06 +00:00

bpy_operator.h

doxygen: blender/python tagged.

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

bpy_props.c

IDProperty python module update

2011-06-17 05:45:46 +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

Fixes for bugs noticed during previous fix:

2011-05-08 05:41:57 +00:00

bpy_rna_anim.h

SVN maintenance.

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

bpy_rna_array.c

ulti line formatting for PyErr_Format calls (no functional change)

2011-06-17 02:26:34 +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

script to report deprecated functions of text and their age in days.

2011-07-18 09:49:26 +00:00

bpy_rna.h

disable the readonly state while rna property callbacks run.

2011-06-07 16:08:49 +00:00

bpy_traceback.c

whitespace edits for bpy api, split some really long lines.

2011-04-30 13:58:31 +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

py/rna: BPy_reports_to_error() now takes the exception type as an argument and returns -1 as an error value

2011-03-12 15:18:08 +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