Merging r55547 through r55594 from trunk into soc-2008-mxcurioni
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 26 Mar 2013 09:09:31 +0000 (09:09 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 26 Mar 2013 09:09:31 +0000 (09:09 +0000)
19 files changed:
1  2 
source/blender/blenfont/BLF_translation.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/CMakeLists.txt
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/render/render_shading.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/convertblender.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Simple merge