Merged changes in the trunk up to revision 36408.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 1 May 2011 13:50:38 +0000 (13:50 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 1 May 2011 13:50:38 +0000 (13:50 +0000)
commitb9d41212838be2b8a6f12a9ab209b8700723a711
treef6fcb75e30c863eca32c284719aa7520cf40bdc1
parentbd860f89e75a10cae56be31f97fcd6aa9eb13b8e
parent75494ea5b4dd6554699a563027b73248188b06dc
Merged changes in the trunk up to revision 36408.
20 files changed:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.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/include/ED_anim_api.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_shading.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeoutput.c
source/creator/CMakeLists.txt
source/creator/creator.c