Merged changes in the trunk up to revision 40189.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 13 Sep 2011 22:24:59 +0000 (22:24 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 13 Sep 2011 22:24:59 +0000 (22:24 +0000)
commitac796827cbe88cfa52e1b5196a196355560b9121
tree33c3911381d240068a50f26cde4a33a124390bd9
parent6f418c55c8aee08aa4807ba72787023b8039bbf1
parent8a977cbcc90f870acdb8c03366bfc2c35f4a0a6f
Merged changes in the trunk up to revision 40189.
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/material.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/render/render_shading.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/shadeinput.c
source/blender/render/intern/source/shadeoutput.c
source/creator/creator.c