[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24082] trunk/blender/source/blender/ editors/space_view3d/view3d_select.c: crash fix for recent commit

Campbell Barton ideasman42 at gmail.com
Mon Oct 26 10:35:35 CET 2009


Revision: 24082
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24082
Author:   campbellbarton
Date:     2009-10-26 10:35:33 +0100 (Mon, 26 Oct 2009)

Log Message:
-----------
crash fix for recent commit

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_select.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_select.c	2009-10-26 08:43:24 UTC (rev 24081)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_select.c	2009-10-26 09:35:33 UTC (rev 24082)
@@ -699,7 +699,7 @@
 {
 	Object *ob = CTX_data_active_object(C);
 
-	if(vc->obedit==NULL) {
+	if(vc->obedit==NULL) { /* Object Mode */
 		if(paint_facesel_test(ob))
 			do_lasso_select_facemode(vc, mcords, moves, select);
 		else if(ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT))
@@ -709,16 +709,18 @@
 		else  
 			do_lasso_select_objects(vc, mcords, moves, select);
 	}
-	else if(vc->obedit->type==OB_MESH) {
-		do_lasso_select_mesh(vc, mcords, moves, select);
-	} else if(vc->obedit->type==OB_CURVE || vc->obedit->type==OB_SURF) 
-		do_lasso_select_curve(vc, mcords, moves, select);
-	else if(vc->obedit->type==OB_LATTICE) 
-		do_lasso_select_lattice(vc, mcords, moves, select);
-	else if(vc->obedit->type==OB_ARMATURE)
-		do_lasso_select_armature(vc, mcords, moves, select);
+	else { /* Edit Mode */
+		if(vc->obedit->type==OB_MESH)
+			do_lasso_select_mesh(vc, mcords, moves, select);
+		else if(vc->obedit->type==OB_CURVE || vc->obedit->type==OB_SURF) 
+			do_lasso_select_curve(vc, mcords, moves, select);
+		else if(vc->obedit->type==OB_LATTICE) 
+			do_lasso_select_lattice(vc, mcords, moves, select);
+		else if(vc->obedit->type==OB_ARMATURE)
+			do_lasso_select_armature(vc, mcords, moves, select);
 	
-	WM_event_add_notifier(C, NC_GEOM|ND_SELECT, vc->obedit->data);
+		WM_event_add_notifier(C, NC_GEOM|ND_SELECT, vc->obedit->data);
+	}
 }
 
 





More information about the Bf-blender-cvs mailing list