[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25711] trunk/blender/source/blender/ editors/space_view3d/view3d_select.c: Sculpt: fix, disable border/circle/ mouse select operators in sculpt mode.

[Brecht Van Lommel]

Revision: 25711
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25711
Author:   blendix
Date:     2010-01-04 18:03:44 +0100 (Mon, 04 Jan 2010)

Log Message:
-----------
Sculpt: fix, disable border/circle/mouse select operators in sculpt mode.

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	2010-01-04 16:53:32 UTC (rev 25710)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_select.c	2010-01-04 17:03:44 UTC (rev 25711)
@@ -1424,6 +1424,8 @@
 	else if(obedit==NULL && (obact && obact->mode & OB_MODE_PARTICLE_EDIT)) {
 		return PE_border_select(C, &rect, selecting, extend);
 	}
+	else if(obedit==NULL && (obact && obact->mode & OB_MODE_SCULPT))
+		return OPERATOR_CANCELLED;
 	
 	if(obedit) {
 		if(obedit->type==OB_MESH) {
@@ -1689,6 +1691,8 @@
 			retval = mouse_mball(C, event->mval, extend);
 			
 	}
+	else if(obact && obact->mode & OB_MODE_SCULPT)
+		return OPERATOR_CANCELLED;
 	else if(obact && obact->mode & OB_MODE_PARTICLE_EDIT)
 		return PE_mouse_particles(C, event->mval, extend);
 	else if(obact && paint_facesel_test(obact))
@@ -2012,6 +2016,9 @@
 		else
 			return PE_circle_select(C, selecting, mval, (float)radius);
 	}
+	else if(obact && obact->mode & OB_MODE_SCULPT) {
+		return OPERATOR_CANCELLED;
+	}
 	else {
 		Base *base;
 		selecting= selecting?BA_SELECT:BA_DESELECT;