Merged changes in the trunk up to revision 34828.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 13 Feb 2011 23:47:30 +0000 (23:47 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 13 Feb 2011 23:47:30 +0000 (23:47 +0000)
commit3789c398ff2b2fd7f0eadba45686b0e235186f4a
treeafe1f241f03d17de7df10a414516f03c277518a1
parent5ed1597e2672cc0e59f8a1ca7c54ae3ad9206b8c
parent4ca2905ead92f23b1aca7bdbcc23c605dd830a87
Merged changes in the trunk up to revision 34828.

Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h
32 files changed:
release/scripts/ui/properties_render.py
release/scripts/ui/space_dopesheet.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/idcode.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/intern/bpath.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/interface/interface_templates.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/python/intern/bpy.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeinput.c
source/creator/CMakeLists.txt
source/creator/creator.c