[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33331] trunk/blender/source/blender/ editors/physics/particle_edit.c: lasso select wasn' t comparing the depth with particle selection, where border and circle select do.

[Campbell Barton]

Revision: 33331
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33331
Author:   campbellbarton
Date:     2010-11-26 14:40:47 +0100 (Fri, 26 Nov 2010)

Log Message:
-----------
lasso select wasn't comparing the depth with particle selection, where border and circle select do.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/physics/particle_edit.c

Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c	2010-11-26 12:57:35 UTC (rev 33330)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c	2010-11-26 13:40:47 UTC (rev 33331)
@@ -1608,12 +1608,17 @@
 	float co[3], mat[4][4];
 	short vertco[2];
 
+	PEData data;
+
 	if(!PE_start_edit(edit))
 		return OPERATOR_CANCELLED;
 
 	if (extend == 0 && select)
 		PE_deselect_all_visible(edit);
-	
+
+	/* only for depths */
+	PE_set_view3d_data(C, &data);
+
 	unit_m4(mat);
 
 	LOOP_VISIBLE_POINTS {
@@ -1625,7 +1630,7 @@
 				VECCOPY(co, key->co);
 				mul_m4_v3(mat, co);
 				project_short(ar, co, vertco);
-				if((vertco[0] != IS_CLIPPED) && lasso_inside(mcords,moves,vertco[0],vertco[1])) {
+				if((vertco[0] != IS_CLIPPED) && lasso_inside(mcords,moves,vertco[0],vertco[1]) && key_test_depth(&data, co)) {
 					if(select && !(key->flag & PEK_SELECT)) {
 						key->flag |= PEK_SELECT;
 						point->flag |= PEP_EDIT_RECALC;
@@ -1643,7 +1648,7 @@
 			VECCOPY(co, key->co);
 			mul_m4_v3(mat, co);
 			project_short(ar, co,vertco);
-			if((vertco[0] != IS_CLIPPED) && lasso_inside(mcords,moves,vertco[0],vertco[1])) {
+			if((vertco[0] != IS_CLIPPED) && lasso_inside(mcords,moves,vertco[0],vertco[1]) && key_test_depth(&data, co)) {
 				if(select && !(key->flag & PEK_SELECT)) {
 					key->flag |= PEK_SELECT;
 					point->flag |= PEP_EDIT_RECALC;