Revision: 77325
http://sourceforge.net/p/brlcad/code/77325
Author: starseeker
Date: 2020-10-02 17:29:58 +0000 (Fri, 02 Oct 2020)
Log Message:
-----------
List a couple more objects that aren't shapes
Modified Paths:
--------------
brlcad/trunk/NEWS
brlcad/trunk/src/librt/search.c
Modified: brlcad/trunk/NEWS
===================================================================
--- brlcad/trunk/NEWS 2020-10-02 17:20:13 UTC (rev 77324)
+++ brlcad/trunk/NEWS 2020-10-02 17:29:58 UTC (rev 77325)
@@ -13,6 +13,7 @@
--- 2020-xx-xx Release 7.32.2 ---
----------------------------------------------------------------------
+* updated non-shape objects list for search shape filter - Cliff Yapp
* added volume type to search -type filters - Cliff Yapp
* applied shorter default title in fast4-g conversions - Cliff Yapp
* improved pixcmp support for subset image comparisons - Sean Morrison
Modified: brlcad/trunk/src/librt/search.c
===================================================================
--- brlcad/trunk/src/librt/search.c 2020-10-02 17:20:13 UTC (rev 77324)
+++ brlcad/trunk/src/librt/search.c 2020-10-02 17:29:58 UTC (rev 77325)
@@ -1104,12 +1104,15 @@
/* Match anything that doesn't define a 2D or 3D shape - unfortunately,
this list will have to
* be updated manually unless/until some functionality is added to
generate it */
if (!bu_path_match(plan->p_un._type_data, "shape", 0) &&
+ intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_ANNOT &&
intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_COMBINATION &&
- intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_ANNOT &&
- intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_SCRIPT &&
intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_CONSTRAINT &&
+ intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_DATUM &&
intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_GRIP &&
- intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_JOINT
+ intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_JOINT &&
+ intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_PNTS &&
+ intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_SCRIPT &&
+ intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_SUBMODEL
) {
type_match = 1;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
