Revision: 78317
          http://sourceforge.net/p/brlcad/code/78317
Author:   starseeker
Date:     2021-02-24 18:11:55 +0000 (Wed, 24 Feb 2021)
Log Message:
-----------
If we're switching back and forth between full and object searches, the UNIQ_DB 
flag may be set incorrectly.  Make sure the flag for unique path returns is 
unset before invoking a full path db_search.  Reported by Sean.

Modified Paths:
--------------
    brlcad/trunk/NEWS
    brlcad/trunk/src/libged/search/search.c

Modified: brlcad/trunk/NEWS
===================================================================
--- brlcad/trunk/NEWS   2021-02-24 16:45:51 UTC (rev 78316)
+++ brlcad/trunk/NEWS   2021-02-24 18:11:55 UTC (rev 78317)
@@ -13,6 +13,7 @@
 --- 2021-XX-XX  Release 7.32.4                                     ---
 ----------------------------------------------------------------------
 
+* fixed mixing object and full path searches in MGED - Cliff Yapp
 * fixed launching of ISST graphical viewer - Cliff Yapp
 * updated stepcode to latest upstream version - Cliff Yapp
 

Modified: brlcad/trunk/src/libged/search/search.c
===================================================================
--- brlcad/trunk/src/libged/search/search.c     2021-02-24 16:45:51 UTC (rev 
78316)
+++ brlcad/trunk/src/libged/search/search.c     2021-02-24 18:11:55 UTC (rev 
78317)
@@ -579,6 +579,7 @@
 
                        switch (search->search_type) {
                            case 0:
+                               flags &= ~DB_SEARCH_RETURN_UNIQ_DP;
                                (void)db_search(search_results, flags, 
bu_vls_addr(&search_string), 1, &curr_path, gedp->ged_wdbp->dbip, ctx);
 
                                sr_len = j = BU_PTBL_LEN(search_results);

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to