[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49339] branches/soc-2012-sushi/source/ blender: Re-enabled bridge ( fixed crash that happened on windows when enabled).

[Howard Trickey]

Revision: 49339
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49339
Author:   howardt
Date:     2012-07-28 21:45:51 +0000 (Sat, 28 Jul 2012)
Log Message:
-----------
Re-enabled bridge (fixed crash that happened on windows when enabled).
Also fixed typo extra 'is' in snap.c.

Modified Paths:
--------------
    branches/soc-2012-sushi/source/blender/blenkernel/intern/snap.c
    branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2012-sushi/source/blender/editors/mesh/mesh_ops.c

Modified: branches/soc-2012-sushi/source/blender/blenkernel/intern/snap.c
===================================================================
--- branches/soc-2012-sushi/source/blender/blenkernel/intern/snap.c	2012-07-28 20:45:40 UTC (rev 49338)
+++ branches/soc-2012-sushi/source/blender/blenkernel/intern/snap.c	2012-07-28 21:45:51 UTC (rev 49339)
@@ -284,7 +284,7 @@
   */
 
 void SnapSystem_default_object_handler(SnapSystem* ssystem, void* callback_data, Object* ob){
-	int retval;is
+	int retval;
 	TransInfo* t = (TransInfo*)callback_data; //hack to test using existing option system
 	BMEditMesh *em;
 	DerivedMesh *dm;

Modified: branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_tools.c	2012-07-28 20:45:40 UTC (rev 49338)
+++ branches/soc-2012-sushi/source/blender/editors/mesh/editmesh_tools.c	2012-07-28 21:45:51 UTC (rev 49339)
@@ -4845,7 +4845,8 @@
 
 static EnumPropertyItem prop_mesh_bridge_interpolation_types[] = {
     {BRIDGE_LINEAR, "LINEAR", 0, "Linear", ""},
-    {BRIDGE_CUBIC, "CUBIC", 0, "Cubic", ""}
+    {BRIDGE_CUBIC, "CUBIC", 0, "Cubic", ""},
+    {0, NULL, 0, NULL, NULL}
 };
 
 void MESH_OT_bridge_edge_loops(wmOperatorType *ot)

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-28 20:45:40 UTC (rev 49338)
+++ branches/soc-2012-sushi/source/blender/editors/mesh/mesh_ops.c	2012-07-28 21:45:51 UTC (rev 49339)
@@ -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);