Revision: 75667
http://sourceforge.net/p/brlcad/code/75667
Author: starseeker
Date: 2020-05-02 03:08:37 +0000 (Sat, 02 May 2020)
Log Message:
-----------
check type once, up front
Modified Paths:
--------------
brlcad/trunk/src/libged/bot/check.cpp
Modified: brlcad/trunk/src/libged/bot/check.cpp
===================================================================
--- brlcad/trunk/src/libged/bot/check.cpp 2020-05-02 02:57:20 UTC (rev
75666)
+++ brlcad/trunk/src/libged/bot/check.cpp 2020-05-02 03:08:37 UTC (rev
75667)
@@ -275,11 +275,6 @@
struct _ged_bot_icheck *gib = (struct _ged_bot_icheck *)bs;
- if (gib->gb->intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
- bu_vls_printf(gib->gb->gedp->ged_result_str, ": object %s is not of
type bot\n", gib->gb->solid_name.c_str());
- return GED_ERROR;
- }
-
struct rt_bot_internal *bot = (struct rt_bot_internal
*)(gib->gb->intern.idb_ptr);
struct bu_color *color = gib->gb->color;
struct bn_vlblock *vbp = gib->gb->vbp;
@@ -350,11 +345,6 @@
struct _ged_bot_icheck *gib = (struct _ged_bot_icheck *)bs;
- if (gib->gb->intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
- bu_vls_printf(gib->gb->gedp->ged_result_str, ": object %s is not of
type bot\n", gib->gb->solid_name.c_str());
- return GED_ERROR;
- }
-
struct rt_bot_internal *bot = (struct rt_bot_internal
*)(gib->gb->intern.idb_ptr);
struct bu_color *color = gib->gb->color;
struct bn_vlblock *vbp = gib->gb->vbp;
@@ -435,11 +425,6 @@
struct _ged_bot_icheck *gib = (struct _ged_bot_icheck *)bs;
- if (gib->gb->intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
- bu_vls_printf(gib->gb->gedp->ged_result_str, ": object %s is not of
type bot\n", gib->gb->solid_name.c_str());
- return GED_ERROR;
- }
-
struct rt_bot_internal *bot = (struct rt_bot_internal
*)(gib->gb->intern.idb_ptr);
struct bu_color *color = gib->gb->color;
struct bn_vlblock *vbp = gib->gb->vbp;
@@ -520,11 +505,6 @@
struct _ged_bot_icheck *gib = (struct _ged_bot_icheck *)bs;
- if (gib->gb->intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
- bu_vls_printf(gib->gb->gedp->ged_result_str, ": object %s is not of
type bot\n", gib->gb->solid_name.c_str());
- return GED_ERROR;
- }
-
struct rt_bot_internal *bot = (struct rt_bot_internal
*)(gib->gb->intern.idb_ptr);
struct bu_color *color = gib->gb->color;
struct bn_vlblock *vbp = gib->gb->vbp;
@@ -606,11 +586,6 @@
struct _ged_bot_icheck *gib = (struct _ged_bot_icheck *)bs;
- if (gib->gb->intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
- bu_vls_printf(gib->gb->gedp->ged_result_str, ": object %s is not of
type bot\n", gib->gb->solid_name.c_str());
- return GED_ERROR;
- }
-
struct rt_bot_internal *bot = (struct rt_bot_internal
*)(gib->gb->intern.idb_ptr);
struct bn_vlblock *vbp = gib->gb->vbp;
struct bg_trimesh_solid_errors errors = BG_TRIMESH_SOLID_ERRORS_INIT_NULL;
@@ -748,6 +723,11 @@
return GED_OK;
}
+ if (gb->intern.idb_minor_type != DB5_MINORTYPE_BRLCAD_BOT) {
+ bu_vls_printf(gb->gedp->ged_result_str, "%s is not of type bot\n",
gb->solid_name.c_str());
+ return GED_ERROR;
+ }
+
argc--; argv++;
// Must have valid subcommand to process
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
