svn merge ^/trunk/blender -r40371:40372
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 05:59:37 +0000 (05:59 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 05:59:37 +0000 (05:59 +0000)
commita13f94865aa145be235eb28c411fdcc91982172e
tree0921fc9286dcf1ff04dcba7809206c4f02d0c255
parent58e7678952914060f9276b84eb9e6f3e22ae4642
parentb263aefb0ec4d6b46b4cd7e4b15ac7f99af4c59e
svn merge ^/trunk/blender -r40371:40372
18 files changed:
release/scripts/startup/bl_ui/space_info.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/editderivedbmesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_uvproject.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp