Tamito Kajiyama efc4341ee4 Merged changes in the trunk up to revision 42556. ...

Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c

2011-12-10 20:54:43 +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

minor bpy api edits

2011-11-26 15:18:30 +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

fix for noise module in driver namespace (was infact mathutils).

2011-12-07 00:36:57 +00:00

bpy_driver.h

pydrivers: 'frame' is now in the driver namespace,

2011-11-17 07:08:09 +00:00

bpy_interface_atexit.c

documentation - brief descriptions for bpy api files.

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

bpy_interface.c

patch [#29421] Python Noise Module Updates

2011-11-29 10:28:52 +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

fix [#29462] libraries.load can't have link=False when relative=True

2011-11-30 06:15:35 +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

minor bpy api edits

2011-11-26 15:18:30 +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

Fix: defining properties would fail with argument update=None instead of not

2011-11-29 22:57:35 +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

minor bpy api edits

2011-11-26 15:18:30 +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

minor bpy api edits

2011-11-26 15:18:30 +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

add library support for rna collection __contains__, eg

2011-12-03 06:10:32 +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

minor bpy api edits

2011-11-26 15:18:30 +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 42425.

2011-12-05 02:12:49 +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 41768.

2011-11-12 23:12:30 +00:00

gpu.c

fixes scale on derivative maps

2011-12-09 23:26:06 +00:00

gpu.h

remove header text:

2011-11-29 10:54:47 +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