Merged changes in the trunk up to revision 32565.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 18 Oct 2010 20:40:43 +0000 (20:40 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 18 Oct 2010 20:40:43 +0000 (20:40 +0000)
commit894daa01be1ba5b2f128b1e779d9a38c4c4e7700
treee03309f3c35c2108fe8ac817336106b23e2301c2
parent90b69a13a7f7b829c2eb314d1fd1efd56fd0a487
parentbf09c851a97aba67b19a5fc85a91d874e28d1df1
Merged changes in the trunk up to revision 32565.
35 files changed:
release/scripts/ui/properties_render.py
source/blender/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_channels.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/freestyle/intern/stroke/Canvas.cpp
source/blender/freestyle/intern/system/PythonInterpreter.h
source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy.c
source/blender/render/CMakeLists.txt
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeoutput.c
source/creator/CMakeLists.txt
source/creator/creator.c