Merged changes in the trunk up to revision 50956.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 30 Sep 2012 13:16:55 +0000 (13:16 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 30 Sep 2012 13:16:55 +0000 (13:16 +0000)
commite91f33101ff0999e07f7ce941f31dca793d954e7
tree83c0d933f2ac1d063e2c57aaded58fd09d8d5712
parenta42ba82f638e481d7fd3c3ed2ba05c331ef6717e
parent818b2e81da7d5f3e04439e3b4fef5c7ce5263b5b
Merged changes in the trunk up to revision 50956.

Conflicts resolved:
source/blender/editors/interface/resources.c
23 files changed:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/python/intern/bpy.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt