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

..

freestyle

Fix for a bug in the Distance from Object modifiers.

2010-12-04 09:58:58 +00:00

io/netrender

netrender

2011-01-08 19:42:26 +00:00

keyingsets

- Typo fixes

2010-12-28 11:50:10 +00:00

modules

recent change to keyframe menu broke BVH import, now don't use the operator at all, instead assign the action manually.

2011-01-03 08:28:22 +00:00

op

bugfix [#25522] Export to X3D is missing ImageTexture and TextureTransform for plane with image texture

2011-01-07 02:39:48 +00:00

presets

modified fix for commits r33811, 33812.

2010-12-20 23:26:29 +00:00

templates

== text editor templates ==

2010-12-22 18:43:21 +00:00

ui

Merged changes in the trunk up to revision 34193.

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