Merging r38832 through r38897 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 1 Aug 2011 15:24:15 +0000 (15:24 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 1 Aug 2011 15:24:15 +0000 (15:24 +0000)
commite9b3225b8d3df25d2b3f87b83398113f87d90854
treea6c4a54921cd0a1a12883b7b5788b0068489a590
parent3eea1954c106222b7213f8fe026528601b8fb948
parentc965d1d2ccfd57926476cb5c091afa35c6de217f
Merging r38832 through r38897 from trunk into soc-2011-tomato
CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/rna_ID.c
source/blender/modifiers/intern/MOD_uvproject.c