Revision: 75550
http://sourceforge.net/p/brlcad/code/75550
Author: starseeker
Date: 2020-04-22 20:01:38 +0000 (Wed, 22 Apr 2020)
Log Message:
-----------
Cherrypick r75549 - fix for nirt, rtcheck, etc. vlist drawing behavior
Modified Paths:
--------------
brlcad/branches/RELEASE/src/libged/draw.c
brlcad/branches/RELEASE/src/libged/vdraw.c
brlcad/branches/RELEASE/src/mged/dodraw.c
Property Changed:
----------------
brlcad/branches/RELEASE/
Index: brlcad/branches/RELEASE
===================================================================
--- brlcad/branches/RELEASE 2020-04-22 19:01:53 UTC (rev 75549)
+++ brlcad/branches/RELEASE 2020-04-22 20:01:38 UTC (rev 75550)
Property changes on: brlcad/branches/RELEASE
___________________________________________________________________
Modified: svn:mergeinfo
## -6,4 +6,4 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
-/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-74976,74981,74991,75056,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495
\ No newline at end of property
+/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-74976,74981,74991,75056,75325,75375,75377-75378,75387,75470-75472,75477,75492,75495,75549
\ No newline at end of property
Modified: brlcad/branches/RELEASE/src/libged/draw.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/draw.c 2020-04-22 19:01:53 UTC (rev
75549)
+++ brlcad/branches/RELEASE/src/libged/draw.c 2020-04-22 20:01:38 UTC (rev
75550)
@@ -577,7 +577,7 @@
if (BU_LIST_IS_EMPTY(&(vbp->head[i])))
continue;
snprintf(namebuf, 64, "%s%lx", shortname, vbp->rgb[i]);
- invent_solid(gedp->ged_gdp->gd_headDisplay, gedp->ged_wdbp->dbip,
gedp->ged_create_vlist_solid_callback, gedp->ged_free_vlist_callback, namebuf,
&vbp->head[i], vbp->rgb[i], copy, 0.0, 0, gedp->freesolid, 0);
+ invent_solid(gedp->ged_gdp->gd_headDisplay, gedp->ged_wdbp->dbip,
gedp->ged_create_vlist_solid_callback, gedp->ged_free_vlist_callback, namebuf,
&vbp->head[i], vbp->rgb[i], copy, 1.0, 0, gedp->freesolid, 0);
}
}
Modified: brlcad/branches/RELEASE/src/libged/vdraw.c
===================================================================
--- brlcad/branches/RELEASE/src/libged/vdraw.c 2020-04-22 19:01:53 UTC (rev
75549)
+++ brlcad/branches/RELEASE/src/libged/vdraw.c 2020-04-22 20:01:38 UTC (rev
75550)
@@ -542,7 +542,7 @@
}
/* 0 means OK, -1 means conflict with real solid name */
- idx = invent_solid(gedp->ged_gdp->gd_headDisplay, gedp->ged_wdbp->dbip,
gedp->ged_create_vlist_solid_callback, gedp->ged_free_vlist_callback,
solid_name, &(gedp->ged_gdp->gd_currVHead->vdc_vhd),
gedp->ged_gdp->gd_currVHead->vdc_rgb, 1, 0.0, 0, gedp->freesolid, 0);
+ idx = invent_solid(gedp->ged_gdp->gd_headDisplay, gedp->ged_wdbp->dbip,
gedp->ged_create_vlist_solid_callback, gedp->ged_free_vlist_callback,
solid_name, &(gedp->ged_gdp->gd_currVHead->vdc_vhd),
gedp->ged_gdp->gd_currVHead->vdc_rgb, 1, 1.0, 0, gedp->freesolid, 0);
bu_vls_printf(gedp->ged_result_str, "%d", idx);
Modified: brlcad/branches/RELEASE/src/mged/dodraw.c
===================================================================
--- brlcad/branches/RELEASE/src/mged/dodraw.c 2020-04-22 19:01:53 UTC (rev
75549)
+++ brlcad/branches/RELEASE/src/mged/dodraw.c 2020-04-22 20:01:38 UTC (rev
75550)
@@ -62,7 +62,7 @@
snprintf(namebuf, sizeof(namebuf), "%s%lx", shortname, vbp->rgb[i]);
/*invent_solid(namebuf, &vbp->head[i], vbp->rgb[i], copy);*/
- invent_solid(GEDP->ged_gdp->gd_headDisplay, DBIP, createDListSolid,
GEDP->ged_free_vlist_callback, namebuf, &vbp->head[i], vbp->rgb[i], copy,
0.0,0, GEDP->freesolid, 0);
+ invent_solid(GEDP->ged_gdp->gd_headDisplay, DBIP, createDListSolid,
GEDP->ged_free_vlist_callback, namebuf, &vbp->head[i], vbp->rgb[i], copy, 1.0,
0, GEDP->freesolid, 0);
}
}
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
