[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53173] tags/blender-2.65a-release/blender : svn merge ^/trunk/blender -c53172

[Campbell Barton]

Revision: 53173
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53173
Author:   campbellbarton
Date:     2012-12-19 11:19:43 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
svn merge ^/trunk/blender -c53172

Modified Paths:
--------------
    tags/blender-2.65a-release/blender/source/blender/python/bmesh/bmesh_py_utils.c

Property Changed:
----------------
    tags/blender-2.65a-release/blender/


Property changes on: tags/blender-2.65a-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:52842-52858,52867,52870-52871,52883,52891,52910,52915,52919,52928,52930,52945,52958,52966,52977,52981,52994-52998,53005,53015,53037-53039,53056,53061,53063,53065-53067,53077,53086-53087,53090,53095-53096,53102-53105,53107,53112,53123,53129,53148
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:52842-52858,52867,52870-52871,52883,52891,52910,52915,52919,52928,52930,52945,52958,52966,52977,52981,52994-52998,53005,53015,53037-53039,53056,53061,53063,53065-53067,53077,53086-53087,53090,53095-53096,53102-53105,53107,53112,53123,53129,53148,53172

Modified: tags/blender-2.65a-release/blender/source/blender/python/bmesh/bmesh_py_utils.c
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/python/bmesh/bmesh_py_utils.c	2012-12-19 11:18:08 UTC (rev 53172)
+++ tags/blender-2.65a-release/blender/source/blender/python/bmesh/bmesh_py_utils.c	2012-12-19 11:19:43 UTC (rev 53173)
@@ -106,7 +106,7 @@
 PyDoc_STRVAR(bpy_bm_utils_vert_collapse_faces_doc,
 ".. method:: vert_collapse_faces(vert, edge, fac, join_faces)\n"
 "\n"
-"   Split an edge, return the newly created data.\n"
+"   Collapses a vertex that has only two manifold edges onto a vertex it shares an edge with.\n"
 "\n"
 "   :arg vert: The vert that will be collapsed.\n"
 "   :type vert: :class:`bmesh.types.BMVert`\n"
@@ -163,7 +163,7 @@
 	}
 	else {
 		PyErr_SetString(PyExc_ValueError,
-		                "vert_collapse_edge(vert, edge): no new edge created, internal error");
+		                "vert_collapse_faces(vert, edge): no new edge created, internal error");
 		return NULL;
 	}
 }