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)
1  2 
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

Simple merge
Simple merge