[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49288] branches/soc-2012-sushi/source/ blender: Stop bevel from crashing, and restore bridge_edge_loops

[Howard Trickey]

Revision: 49288
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49288
Author:   howardt
Date:     2012-07-27 11:34:20 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
Stop bevel from crashing, and restore bridge_edge_loops
operator (problems introduced in r49093 svn merge).

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49093

Modified Paths:
--------------
    branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_bevel.c
    branches/soc-2012-sushi/source/blender/editors/mesh/mesh_ops.c

Modified: branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_bevel.c
===================================================================
--- branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_bevel.c	2012-07-27 11:07:55 UTC (rev 49287)
+++ branches/soc-2012-sushi/source/blender/bmesh/operators/bmo_bevel.c	2012-07-27 11:34:20 UTC (rev 49288)
@@ -371,12 +371,11 @@
 //TODO rename it!
 AdditionalVert* get_additionalVert_by_vert(BevelParams *bp, BMVert *v)
 {
-    VertexItem *item;
+    AdditionalVert *item;
     AdditionalVert *av = NULL;
     for (item = bp->vertList.first; item ; item = item->next){
         if (item->v == v)
-            //av = item;
-			av->v = item->v;
+            av = item;
     }
     return av;
 }

Modified: branches/soc-2012-sushi/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- branches/soc-2012-sushi/source/blender/editors/mesh/mesh_ops.c	2012-07-27 11:07:55 UTC (rev 49287)
+++ branches/soc-2012-sushi/source/blender/editors/mesh/mesh_ops.c	2012-07-27 11:34:20 UTC (rev 49288)
@@ -161,7 +161,7 @@
 
 	WM_operatortype_append(MESH_OT_select_next_loop);
 
-	//WM_operatortype_append(MESH_OT_bridge_edge_loops);
+	WM_operatortype_append(MESH_OT_bridge_edge_loops);
 	WM_operatortype_append(MESH_OT_inset);
 	WM_operatortype_append(MESH_OT_wireframe);
 	WM_operatortype_append(MESH_OT_edge_split);