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 3df52d4e19 Merged changes in the trunk up to revision 36092. ...

Conflicts resolved:
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c

2011-04-11 00:09:56 +00:00

..

bpy_app.c

modification to api docs so release point to:

2011-04-01 15:13:58 +00:00

bpy_app.h

doxygen: blender/python tagged.

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

bpy_driver.c

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

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

bpy_driver.h

doxygen: blender/python tagged.

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

bpy_interface.c

modify error when python is not found so as not to confuse users who don't build blender.

2011-03-30 07:21:41 +00:00

bpy_library.c

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

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

bpy_operator_wrap.c

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

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

bpy_operator_wrap.h

doxygen: blender/python tagged.

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

bpy_operator.c

Merged changes in the trunk up to revision 35828.

2011-03-27 23:11:22 +00:00

bpy_operator.h

doxygen: blender/python tagged.

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

bpy_props.c

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

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

bpy_props.h

doxygen: blender/python tagged.

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

bpy_rna_anim.c

quiet various warnings, also disable -Wdouble-promotion with cmake since it gives warnings with variable length args.

2011-04-03 10:04:16 +00:00

bpy_rna_anim.h

SVN maintenance.

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

bpy_rna_array.c

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

2011-03-19 11:12:48 +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

add new subtype PROP_COORDS, for generic coordinates that are not to be changed by units.

2011-04-08 13:32:56 +00:00

bpy_rna.h

quiet various warnings, also disable -Wdouble-promotion with cmake since it gives warnings with variable length args.

2011-04-03 10:04:16 +00:00

bpy_traceback.c

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

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

bpy_traceback.h

doxygen: blender/python tagged.

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

bpy_util.c

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

2011-03-19 11:12:48 +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 36092.

2011-04-11 00:09:56 +00:00

bpy.h

doxygen: blender/python tagged.

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

CMakeLists.txt

Merged changes in the trunk up to revision 35505.

2011-03-13 02:10:39 +00:00

stubs.c

doxygen: blender/python tagged.

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