Revision: 76039
http://sourceforge.net/p/brlcad/code/76039
Author: starseeker
Date: 2020-06-06 14:25:41 +0000 (Sat, 06 Jun 2020)
Log Message:
-----------
Merge remaining RELEASE changes back into trunk (r76038)
Modified Paths:
--------------
brlcad/trunk/misc/debian/changelog
brlcad/trunk/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf
brlcad/trunk/misc/macosx/Resources/Welcome.rtfd/TXT.rtf
brlcad/trunk/src/mged/dozoom.c
brlcad/trunk/src/rt/viewedge.c
Property Changed:
----------------
brlcad/trunk/
brlcad/trunk/include/
brlcad/trunk/regress/
brlcad/trunk/src/libbu/
brlcad/trunk/src/other/
brlcad/trunk/src/other/libregex/
Index: brlcad/trunk
===================================================================
--- brlcad/trunk 2020-06-05 19:26:15 UTC (rev 76038)
+++ brlcad/trunk 2020-06-06 14:25:41 UTC (rev 76039)
Property changes on: brlcad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE:57439,57447-57860,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75682-75685
+/brlcad/branches/RELEASE:57439,57447-57860,69901-69913,70323-70333,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75685
/brlcad/branches/bioh:75720-75736,75740-75742,75860-75891,75894-75986
/brlcad/branches/brep-debug:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69168,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
/brlcad/branches/bullet:62518
Index: brlcad/trunk/include
===================================================================
--- brlcad/trunk/include 2020-06-05 19:26:15 UTC (rev 76038)
+++ brlcad/trunk/include 2020-06-06 14:25:41 UTC (rev 76039)
Property changes on: brlcad/trunk/include
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE/include:57439,57447-57860,69901-69913,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140
+/brlcad/branches/RELEASE/include:57439,57447-57860,69901-69913,71915-72242,72525-72534,72826-72858,74376-74454,74964-75140,75372-75681
/brlcad/branches/bioh/include:75720-75736,75740-75742,75860-75891,75894-75986
/brlcad/branches/brep-debug/include:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927
/brlcad/branches/bullet/include:62518
Modified: brlcad/trunk/misc/debian/changelog
===================================================================
--- brlcad/trunk/misc/debian/changelog 2020-06-05 19:26:15 UTC (rev 76038)
+++ brlcad/trunk/misc/debian/changelog 2020-06-06 14:25:41 UTC (rev 76039)
@@ -1,3 +1,10 @@
+brlcad (7.30.8-0) unstable; urgency=low
+
+ * update brlcad version
+
+ -- Cliff Yapp <[email protected]> Wed, 13 Apr 2020 05:34:29 UTC
+
+
brlcad (7.30.6-0) unstable; urgency=low
* update brlcad version
Modified: brlcad/trunk/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf
===================================================================
--- brlcad/trunk/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf 2020-06-05
19:26:15 UTC (rev 76038)
+++ brlcad/trunk/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf 2020-06-06
14:25:41 UTC (rev 76039)
@@ -11,7 +11,7 @@
\f0\i\b\fs72 \cf0 README
\fs36 \
-\f1\i0\b0\fs28 This is BRL-CAD 7.30.6 for Mac OS X. Please send any bugs,
comments, questions, or suggestions to the project website.\
+\f1\i0\b0\fs28 This is BRL-CAD 7.30.8 for Mac OS X. Please send any bugs,
comments, questions, or suggestions to the project website.\
\fs22 \
Modified: brlcad/trunk/misc/macosx/Resources/Welcome.rtfd/TXT.rtf
===================================================================
--- brlcad/trunk/misc/macosx/Resources/Welcome.rtfd/TXT.rtf 2020-06-05
19:26:15 UTC (rev 76038)
+++ brlcad/trunk/misc/macosx/Resources/Welcome.rtfd/TXT.rtf 2020-06-06
14:25:41 UTC (rev 76039)
@@ -4,7 +4,7 @@
\margl1440\margr1440\vieww8020\viewh6280\viewkind0
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
-\f0\fs22 \cf0 This installer will guide you through the installation of
BRL-CAD 7.30.6 for Mac OS X and Darwin.\
+\f0\fs22 \cf0 This installer will guide you through the installation of
BRL-CAD 7.30.8 for Mac OS X and Darwin.\
\
This distribution of BRL-CAD requires approximately 500 MB of available disk
space and does not include source code.\
\
Index: brlcad/trunk/regress
===================================================================
--- brlcad/trunk/regress 2020-06-05 19:26:15 UTC (rev 76038)
+++ brlcad/trunk/regress 2020-06-06 14:25:41 UTC (rev 76039)
Property changes on: brlcad/trunk/regress
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE/regress:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454
+/brlcad/branches/RELEASE/regress:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,75372-75681
/brlcad/branches/bioh/regress:75860-75891,75894-75986
/brlcad/branches/brep-debug/regress:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927
/brlcad/branches/bullet/regress:62518
Index: brlcad/trunk/src/libbu
===================================================================
--- brlcad/trunk/src/libbu 2020-06-05 19:26:15 UTC (rev 76038)
+++ brlcad/trunk/src/libbu 2020-06-06 14:25:41 UTC (rev 76039)
Property changes on: brlcad/trunk/src/libbu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE/src/libbu:70323-70333,71915-71935,72826-72858,74376-74454
+/brlcad/branches/RELEASE/src/libbu:70323-70333,71915-71935,72826-72858,74376-74454,75372-75681
/brlcad/branches/bioh/src/libbu:75720-75736,75860-75891,75894-75986
/brlcad/branches/brep-debug/src/libbu:69168,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
/brlcad/branches/tcltk86/src/libbu:68300-75257
\ No newline at end of property
Modified: brlcad/trunk/src/mged/dozoom.c
===================================================================
--- brlcad/trunk/src/mged/dozoom.c 2020-06-05 19:26:15 UTC (rev 76038)
+++ brlcad/trunk/src/mged/dozoom.c 2020-06-06 14:25:41 UTC (rev 76039)
@@ -1,7 +1,7 @@
/* D O Z O O M . C
* BRL-CAD
*
- * Copyright (c) 1985-2019 United States Government as represented by
+ * Copyright (c) 1985-2020 United States Government as represented by
* the U.S. Army Research Laboratory.
*
* This program is free software; you can redistribute it and/or
@@ -202,9 +202,9 @@
/* draw predictor vlist */
if (mged_variables->mv_predictor) {
dm_set_fg(DMP,
- color_scheme->cs_predictor[0],
- color_scheme->cs_predictor[1],
- color_scheme->cs_predictor[2], 1, 1.0);
+ color_scheme->cs_predictor[0],
+ color_scheme->cs_predictor[1],
+ color_scheme->cs_predictor[2], 1, 1.0);
dm_draw_vlist(DMP, (struct bn_vlist *)&curr_dm_list->dml_p_vlist);
}
@@ -224,14 +224,14 @@
dm_loadmatrix(DMP, mat, which_eye);
inv_viewsize /= modelchanges[15];
dm_set_fg(DMP,
- color_scheme->cs_geo_hl[0],
- color_scheme->cs_geo_hl[1],
- color_scheme->cs_geo_hl[2], 1, 1.0);
+ color_scheme->cs_geo_hl[0],
+ color_scheme->cs_geo_hl[1],
+ color_scheme->cs_geo_hl[2], 1, 1.0);
ndrawn = dm_draw_display_list(DMP, GEDP->ged_gdp->gd_headDisplay, 1.0,
inv_viewsize,
- r, g, b, mged_variables->mv_linewidth,
mged_variables->mv_dlist, 1,
- geometry_default_color, 0,
mged_variables->mv_dlist);
+ r, g, b, mged_variables->mv_linewidth, mged_variables->mv_dlist, 1,
+ geometry_default_color, 0, mged_variables->mv_dlist);
curr_dm_list->dml_ndrawn += ndrawn;
@@ -276,8 +276,8 @@
FOR_ALL_DISPLAYS(dlp, &head_dm_list.l) {
if (dlp->dml_mapped &&
- dm_get_displaylist(dlp->dml_dmp) &&
- dlp->dml_mged_variables->mv_dlist) {
+ dm_get_displaylist(dlp->dml_dmp) &&
+ dlp->dml_mged_variables->mv_dlist) {
if (sp->s_dlist == 0)
sp->s_dlist = dm_gen_dlists(DMP, 1);
@@ -287,9 +287,9 @@
(void)dm_set_fg(DMP, 255, 255, 255, 0, sp->s_transparency);
else
(void)dm_set_fg(DMP,
- (unsigned char)sp->s_color[0],
- (unsigned char)sp->s_color[1],
- (unsigned char)sp->s_color[2], 0,
sp->s_transparency);
+ (unsigned char)sp->s_color[0],
+ (unsigned char)sp->s_color[1],
+ (unsigned char)sp->s_color[2], 0, sp->s_transparency);
(void)dm_draw_vlist(DMP, (struct bn_vlist *)&sp->s_vlist);
(void)dm_end_dlist(DMP);
}
Index: brlcad/trunk/src/other
===================================================================
--- brlcad/trunk/src/other 2020-06-05 19:26:15 UTC (rev 76038)
+++ brlcad/trunk/src/other 2020-06-06 14:25:41 UTC (rev 76039)
Property changes on: brlcad/trunk/src/other
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE/src/other:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,75682-75685
+/brlcad/branches/RELEASE/src/other:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,75372-75685
/brlcad/branches/bioh/src/other:75720-75736,75860-75891,75894-75986
/brlcad/branches/brep-debug/src/other:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927
/brlcad/branches/bullet/src/other:62518
Index: brlcad/trunk/src/other/libregex
===================================================================
--- brlcad/trunk/src/other/libregex 2020-06-05 19:26:15 UTC (rev 76038)
+++ brlcad/trunk/src/other/libregex 2020-06-06 14:25:41 UTC (rev 76039)
Property changes on: brlcad/trunk/src/other/libregex
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE/src/other/libregex:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454
+/brlcad/branches/RELEASE/src/other/libregex:57439,57447-57860,69901-69913,71917-72242,72525-72534,72826-72858,74376-74454,75372-75681
/brlcad/branches/bioh/src/other/libregex:75720-75736
/brlcad/branches/brep-debug/src/other/libregex:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927
/brlcad/branches/bullet/src/other/libregex:62518
Modified: brlcad/trunk/src/rt/viewedge.c
===================================================================
--- brlcad/trunk/src/rt/viewedge.c 2020-06-05 19:26:15 UTC (rev 76038)
+++ brlcad/trunk/src/rt/viewedge.c 2020-06-06 14:25:41 UTC (rev 76039)
@@ -519,6 +519,26 @@
bu_exit(EXIT_FAILURE, "rtedge: occlusion mode set, but no objects were
specified.\n");
}
+
+ // TODO - the setting of colors below broke the -W flag - lines and
+ // background were both white. Looks like rtedge was relying on bgcolor
+ // being black to get a black line in that mode, but it gets set to white
+ // first via -W. Work around this by stashing the "original" bgcolor in a
+ // temporary variable, but this is just a hacky workaround to restore
+ // previous behavior. If -W is just doing what it is supposed to do by
+ // setting a white background, and rtedge wants to set default line color
+ // that is far away from the background color automatically, we need a
+ // different solution for the general case. There is no guarantee that the
+ // initialized contents of bgcolor (currently hard-coded to 0,0,0 up on
+ // line 159) will be appropriate for all backgrounds - indeed, it is
+ // trivially NOT appropriate for all possible background colors.
+ color tmpcolor;
+ tmpcolor[RED] = bgcolor[RED];
+ tmpcolor[GRN] = bgcolor[GRN];
+ tmpcolor[BLU] = bgcolor[BLU];
+
+
+ // Set bgcolor and fgcolor from the floating point versions
bgcolor[0] = background[0] * 255.0 + 0.5;
bgcolor[1] = background[1] * 255.0 + 0.5;
bgcolor[2] = background[2] * 255.0 + 0.5;
@@ -532,13 +552,13 @@
if (!default_background) {
int tmp;
tmp = fgcolor[RED];
- fgcolor[RED] = bgcolor[RED];
+ fgcolor[RED] = tmpcolor[RED];
bgcolor[RED] = tmp;
tmp = fgcolor[GRN];
- fgcolor[GRN] = bgcolor[GRN];
+ fgcolor[GRN] = tmpcolor[GRN];
bgcolor[GRN] = tmp;
tmp = fgcolor[BLU];
- fgcolor[BLU] = bgcolor[BLU];
+ fgcolor[BLU] = tmpcolor[BLU];
bgcolor[BLU] = tmp;
}
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
