[brlcad-commits] CVS: brlcad/src/librt bool.c,14.14,14.15
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: Sean M. <br...@us...> - 2006-12-12 20:34:35
|
Update of /cvsroot/brlcad/brlcad/src/librt In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19207/src/librt Modified Files: bool.c Log Message: the comments around the conditional were entirely unintentional.. from the rt_g.debug to RT_G_DEBUG change that was made in 2001. it's just taken this long before someone actually tried to shoot a bundle of rays with librt (or at least this long for someone to complain about the verbose blather) Index: bool.c =================================================================== RCS file: /cvsroot/brlcad/brlcad/src/librt/bool.c,v retrieving revision 14.14 retrieving revision 14.15 diff -w -u -r14.14 -r14.15 --- bool.c 16 Sep 2006 02:04:24 -0000 14.14 +++ bool.c 12 Dec 2006 20:34:31 -0000 14.15 @@ -1082,13 +1082,16 @@ { int r1 = rt_tree_max_raynum( lastregion->reg_treetop, pp ); int r2 = rt_tree_max_raynum( regp->reg_treetop, pp ); + /* Only use this algorithm if one is not the main ray */ if( r1 > 0 || r2 > 0 ) { -/* if(RT_G_DEBUG&DEBUG_PARTITION) */ + if(RT_G_DEBUG&DEBUG_PARTITION) { bu_log("Potential overlay along ray bundle: r1=%d, r2=%d, resolved to %s\n", r1, r2, (r1<r2)?lastregion->reg_name:regp->reg_name); - if( r1 < r2 ) + } + if( r1 < r2 ) { goto code1; /* keep lastregion */ + } goto code2; /* keep regp */ } } |