archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix #20401: hair combing with limit selection to visible does not comb

Browse Source 
all particles.
This commit is contained in:
Brecht Van Lommel
2009-12-18 13:35:30 +00:00
parent 50544ea645
commit be81901317
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/blender/editors/physics/particle_edit.c
View File

@@ -373,7 +373,6 @@ static void PE_set_view3d_data(bContext *C, PEData *data)
static int key_test_depth(PEData *data, float co[3]) static int key_test_depth(PEData *data, float co[3])
{ {
View3D *v3d= data->vc.v3d; View3D *v3d= data->vc.v3d;
RegionView3D *rv3d= data->vc.rv3d;
double ux, uy, uz; double ux, uy, uz;
float depth; float depth;
short wco[3], x,y; short wco[3], x,y;
@@ -393,26 +392,16 @@ static int key_test_depth(PEData *data, float co[3])
x=wco[0]; x=wco[0];
y=wco[1]; y=wco[1];
// XXX verify .. x+= (short)data->vc.ar->winrct.xmin;
y+= (short)data->vc.ar->winrct.ymin;
if(rv3d->depths && x<rv3d->depths->w && y<rv3d->depths->h) { view3d_validate_backbuf(&data->vc);
/* the 0.0001 is an experimental threshold to make selecting keys right next to a surface work better */ glReadPixels(x, y, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depth);
if((float)uz - 0.0001 > rv3d->depths->depths[y*rv3d->depths->w+x])
return 0;
else
return 1;
}
else {
x+= (short)data->vc.ar->winrct.xmin;
y+= (short)data->vc.ar->winrct.ymin;
glReadPixels(x, y, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &depth); if((float)uz - 0.0001 > depth)
return 0;
if((float)uz - 0.0001 > depth) else
return 0; return 1;
else
return 1;
}
} }
static int key_inside_circle(PEData *data, float rad, float co[3], float *distance) static int key_inside_circle(PEData *data, float rad, float co[3], float *distance)