Tamito Kajiyama 80e398e7b2 Merged changes in the trunk up to revision 41638. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c

2011-11-08 06:30:02 +00:00

..

bpy_app_handlers.c

documentation - brief descriptions for bpy api files.

2011-11-05 08:21:12 +00:00

bpy_app_handlers.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

bpy_app.c

documentation - brief descriptions for bpy api files.

2011-11-05 08:21:12 +00:00

bpy_app.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

bpy_driver.c

py operators - don't use the screen as an operators ID anymore, screen's don't store operator instances and operator functions have access to the context if they need the current screen.

2011-11-05 08:40:07 +00:00

bpy_driver.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

bpy_interface_atexit.c

documentation - brief descriptions for bpy api files.

2011-11-05 08:21:12 +00:00

bpy_interface.c

documentation - brief descriptions for bpy api files.

2011-11-05 08:21:12 +00:00

bpy_intern_string.c

documentation - brief descriptions for bpy api files.

2011-11-05 08:21:12 +00:00

bpy_intern_string.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

bpy_library.c

py operators - don't use the screen as an operators ID anymore, screen's don't store operator instances and operator functions have access to the context if they need the current screen.

2011-11-05 08:40:07 +00:00

bpy_operator_wrap.c

documentation - brief descriptions for bpy api files.

2011-11-05 08:21:12 +00:00

bpy_operator_wrap.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

bpy_operator.c

documentation - brief descriptions for bpy api files.

2011-11-05 08:21:12 +00:00

bpy_operator.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

bpy_props.c

documentation - brief descriptions for bpy api files.

2011-11-05 08:21:12 +00:00

bpy_props.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

bpy_rna_anim.c

documentation - brief descriptions for bpy api files.

2011-11-05 08:21:12 +00:00

bpy_rna_anim.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

bpy_rna_array.c

documentation - brief descriptions for bpy api files.

2011-11-05 08:21:12 +00:00

bpy_rna_callback.c

documentation - brief descriptions for bpy api files.

2011-11-05 08:21:12 +00:00

bpy_rna_callback.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

bpy_rna.c

documentation - brief descriptions for bpy api files.

2011-11-05 08:21:12 +00:00

bpy_rna.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

bpy_traceback.c

documentation - brief descriptions for bpy api files.

2011-11-05 08:21:12 +00:00

bpy_traceback.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

bpy_util.c

py operators - don't use the screen as an operators ID anymore, screen's don't store operator instances and operator functions have access to the context if they need the current screen.

2011-11-05 08:40:07 +00:00

bpy_util.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

bpy.c

Merged changes in the trunk up to revision 41638.

2011-11-08 06:30:02 +00:00

bpy.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 40911.

2011-10-10 21:15:11 +00:00

gpu.c

documentation - brief descriptions for bpy api files.

2011-11-05 08:21:12 +00:00

gpu.h

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

stubs.c

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00