Merging up to trunk r38834.
authorJoerg Mueller <nexyon@gmail.com>
Fri, 29 Jul 2011 21:28:18 +0000 (21:28 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Fri, 29 Jul 2011 21:28:18 +0000 (21:28 +0000)
commit29f214f7f31bf7490b0c2795ad716ce5a9dc1818
treefa9cb969c253e58c71c0dd61e89731f185849030
parentce1c78e18bf41115a8a149dd85115292c1919bea
parent6a27da310c61b3372d565060506221a5afb9fe43
Merging up to trunk r38834.
15 files changed:
release/scripts/modules/bpy_types.py
release/scripts/startup/bl_operators/object.py
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/seqeffects.c
source/blender/editors/armature/editarmature.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/transform/transform_generics.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_scene.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/gameengine/Ketsji/KX_KetsjiEngine.cpp