svn merge -r40222:40344 ^/trunk/blender
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 19 Sep 2011 10:48:15 +0000 (10:48 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 19 Sep 2011 10:48:15 +0000 (10:48 +0000)
commit1c0bdad8354139593cecb7cbbe3de27d8c5f6017
tree82fada8c6425a9cd8194d0ac06b91981c7b5087a
parent9b7b8464b9b09f4ca74e40624d3d6c8dffb0247e
parent226ff0d4da13ac66991f1708251faa5dff3f7dea
svn merge -r40222:40344 ^/trunk/blender
14 files changed:
SConstruct
release/scripts/startup/bl_ui/properties_data_curve.py
source/blender/blenfont/BLF_api.h
source/blender/blenfont/intern/blf.c
source/blender/blenkernel/CMakeLists.txt
source/blender/editors/armature/poselib.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_regions.c
source/blender/imbuf/intern/IMB_indexer.h
source/blender/imbuf/intern/indexer.c
source/blender/makesrna/intern/rna_texture_api.c
source/blender/python/intern/bpy_app_handlers.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blender/windowmanager/intern/wm_operators.c