merge from 21113 to 21377
authorLukas Steiblys <imbusy@imbusy.org>
Mon, 6 Jul 2009 14:40:38 +0000 (14:40 +0000)
committerLukas Steiblys <imbusy@imbusy.org>
Mon, 6 Jul 2009 14:40:38 +0000 (14:40 +0000)
1  2 
projectfiles_vc9/blender/blender.sln
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/editors/space_view3d/drawobject.c

index 21610cb3df5924ce0f9de7dc9dc19686aadfb0fb,b8a478671150cf4940a601f6e98b362bc4f9999a..e808caf75c2f5bbab2266d8ccbd64ebf86216e63
@@@ -1,5 -1,5 +1,5 @@@
  Microsoft Visual Studio Solution File, Format Version 10.00\r
--# Visual Studio 2008\r
++# Visual C++ Express 2008\r
  Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "blender", "blender.vcproj", "{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}"\r
        ProjectSection(ProjectDependencies) = postProject\r
                {E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F} = {E5F2F004-C704-4DCC-A08F-6EB1E38EAB9F}\r
@@@ -986,8 -985,8 +985,8 @@@ Globa
                {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.3D Plugin Debug|Win32.Build.0 = 3DPlugin Debug|Win32\r
                {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.3D Plugin Release|Win32.ActiveCfg = 3DPlugin Debug|Win32\r
                {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.3D Plugin Release|Win32.Build.0 = 3DPlugin Debug|Win32\r
--              {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Blender Debug|Win32.ActiveCfg = Blender Debug|Win32\r
--              {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Blender Debug|Win32.Build.0 = Blender Debug|Win32\r
++              {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Blender Debug|Win32.ActiveCfg = Blender Release|Win32\r
++              {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Blender Debug|Win32.Build.0 = Blender Release|Win32\r
                {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Blender Release|Win32.ActiveCfg = Blender Release|Win32\r
                {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.Blender Release|Win32.Build.0 = Blender Release|Win32\r
                {76D90B92-ECC7-409C-9F98-A8814B90F3C0}.BlenderPlayer Debug|Win32.ActiveCfg = Blender Debug|Win32\r