Revision: 76943
http://sourceforge.net/p/brlcad/code/76943
Author: starseeker
Date: 2020-08-25 14:29:18 +0000 (Tue, 25 Aug 2020)
Log Message:
-----------
Merge from trunk r76940 through r76942
Modified Paths:
--------------
brlcad/branches/analyze_cmd/regress/asc/asc2dsp.sh
brlcad/branches/analyze_cmd/src/mged/buttons.c
brlcad/branches/analyze_cmd/src/mged/chgmodel.c
brlcad/branches/analyze_cmd/src/mged/chgview.c
brlcad/branches/analyze_cmd/src/mged/cmd.c
brlcad/branches/analyze_cmd/src/mged/edarb.c
brlcad/branches/analyze_cmd/src/mged/edsol.c
brlcad/branches/analyze_cmd/src/mged/mater.c
brlcad/branches/analyze_cmd/src/mged/overlay.c
brlcad/branches/analyze_cmd/src/mged/usepen.c
Property Changed:
----------------
brlcad/branches/analyze_cmd/
brlcad/branches/analyze_cmd/regress/
Index: brlcad/branches/analyze_cmd
===================================================================
--- brlcad/branches/analyze_cmd 2020-08-25 14:27:38 UTC (rev 76942)
+++ brlcad/branches/analyze_cmd 2020-08-25 14:29:18 UTC (rev 76943)
Property changes on: brlcad/branches/analyze_cmd
___________________________________________________________________
Modified: svn:mergeinfo
## -10,4 +10,4 ##
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
/brlcad/branches/tcltk86:68300-75257
-/brlcad/trunk:76836-76939
\ No newline at end of property
+/brlcad/trunk:76836-76942
\ No newline at end of property
Index: brlcad/branches/analyze_cmd/regress
===================================================================
--- brlcad/branches/analyze_cmd/regress 2020-08-25 14:27:38 UTC (rev 76942)
+++ brlcad/branches/analyze_cmd/regress 2020-08-25 14:29:18 UTC (rev 76943)
Property changes on: brlcad/branches/analyze_cmd/regress
___________________________________________________________________
Modified: svn:mergeinfo
## -10,4 +10,4 ##
/brlcad/branches/osg/regress:62110-62113
/brlcad/branches/prep-cache/regress:68236-68933
/brlcad/branches/tcltk86/regress:68300-75257
-/brlcad/trunk/regress:76836-76939
\ No newline at end of property
+/brlcad/trunk/regress:76836-76942
\ No newline at end of property
Modified: brlcad/branches/analyze_cmd/regress/asc/asc2dsp.sh
===================================================================
--- brlcad/branches/analyze_cmd/regress/asc/asc2dsp.sh 2020-08-25 14:27:38 UTC
(rev 76942)
+++ brlcad/branches/analyze_cmd/regress/asc/asc2dsp.sh 2020-08-25 14:29:18 UTC
(rev 76943)
@@ -96,7 +96,7 @@
log "convert dsp data file in asc decimal format to dsp format"
ASC2="$1/regress/dsp/$BASE2.asc"
rm -f $BASE2.dsp
-run $A2D $ASC2 $BASE2.dsp
+run $A2D "$ASC2" $BASE2.dsp
STATUS=$?
# the two dsp files should be identical
Modified: brlcad/branches/analyze_cmd/src/mged/buttons.c
===================================================================
--- brlcad/branches/analyze_cmd/src/mged/buttons.c 2020-08-25 14:27:38 UTC
(rev 76942)
+++ brlcad/branches/analyze_cmd/src/mged/buttons.c 2020-08-25 14:29:18 UTC
(rev 76943)
@@ -582,6 +582,7 @@
edobj = BE_O_SCALE;
movedir = SARROW;
update_views = 1;
+ dm_set_dirty(DMP, 1);
set_e_axes_pos(1);
edit_absolute_scale = acc_sc_obj - 1.0;
@@ -600,6 +601,7 @@
edobj = BE_O_XSCALE;
movedir = SARROW;
update_views = 1;
+ dm_set_dirty(DMP, 1);
set_e_axes_pos(1);
edit_absolute_scale = acc_sc[0] - 1.0;
@@ -618,6 +620,7 @@
edobj = BE_O_YSCALE;
movedir = SARROW;
update_views = 1;
+ dm_set_dirty(DMP, 1);
set_e_axes_pos(1);
edit_absolute_scale = acc_sc[1] - 1.0;
@@ -636,6 +639,7 @@
edobj = BE_O_ZSCALE;
movedir = SARROW;
update_views = 1;
+ dm_set_dirty(DMP, 1);
set_e_axes_pos(1);
edit_absolute_scale = acc_sc[2] - 1.0;
@@ -654,6 +658,7 @@
edobj = BE_O_X;
movedir = RARROW;
update_views = 1;
+ dm_set_dirty(DMP, 1);
set_e_axes_pos(1);
return TCL_OK;
}
@@ -668,6 +673,7 @@
edobj = BE_O_Y;
movedir = UARROW;
update_views = 1;
+ dm_set_dirty(DMP, 1);
set_e_axes_pos(1);
return TCL_OK;
}
@@ -682,6 +688,7 @@
edobj = BE_O_XY;
movedir = UARROW | RARROW;
update_views = 1;
+ dm_set_dirty(DMP, 1);
set_e_axes_pos(1);
return TCL_OK;
}
@@ -696,6 +703,7 @@
edobj = BE_O_ROTATE;
movedir = ROTARROW;
update_views = 1;
+ dm_set_dirty(DMP, 1);
set_e_axes_pos(1);
return TCL_OK;
}
@@ -759,6 +767,7 @@
be_reject()
{
update_views = 1;
+ dm_set_dirty(DMP, 1);
/* Reject edit */
Modified: brlcad/branches/analyze_cmd/src/mged/chgmodel.c
===================================================================
--- brlcad/branches/analyze_cmd/src/mged/chgmodel.c 2020-08-25 14:27:38 UTC
(rev 76942)
+++ brlcad/branches/analyze_cmd/src/mged/chgmodel.c 2020-08-25 14:29:18 UTC
(rev 76943)
@@ -129,6 +129,7 @@
vect_t v_work;
update_views = 1;
+ dm_set_dirty(DMP, 1);
if (movedir != ROTARROW) {
/* NOT in object rotate mode - put it in obj rot */
@@ -246,6 +247,7 @@
}
update_views = 1;
+ dm_set_dirty(DMP, 1);
MAT_IDN(incr);
@@ -324,6 +326,7 @@
/* Remainder of code concerns object edit case */
update_views = 1;
+ dm_set_dirty(DMP, 1);
MAT_IDN(incr);
MAT_IDN(old);
Modified: brlcad/branches/analyze_cmd/src/mged/chgview.c
===================================================================
--- brlcad/branches/analyze_cmd/src/mged/chgview.c 2020-08-25 14:27:38 UTC
(rev 76942)
+++ brlcad/branches/analyze_cmd/src/mged/chgview.c 2020-08-25 14:29:18 UTC
(rev 76943)
@@ -433,6 +433,7 @@
}
update_views = 1;
+ dm_set_dirty(DMP, 1);
if (flag_R_noresize) {
/* we're done */
@@ -700,6 +701,7 @@
CHECK_DBI_NULL;
update_views = 1;
+ dm_set_dirty(DMP, 1);
GEDP->ged_destroy_vlist_callback = freeDListsAll;
/* FIRST, reject any editing in progress */
@@ -1053,6 +1055,7 @@
}
update_views = 1;
+ dm_set_dirty(DMP, 1);
if (path_piece) {
for (i = 0; path_piece[i] != 0; ++i) {
@@ -1138,6 +1141,7 @@
}
update_views = 1;
+ dm_set_dirty(DMP, 1);
button(BE_S_ILLUMINATE); /* To ST_S_PICK */
@@ -3337,6 +3341,7 @@
mat_t temp1, temp2;
update_views = 1;
+ dm_set_dirty(DMP, 1);
switch (coords) {
case 'm':
@@ -3734,6 +3739,7 @@
new_edit_mats();
update_views = 1;
+ dm_set_dirty(DMP, 1);
}
return TCL_OK;
Modified: brlcad/branches/analyze_cmd/src/mged/cmd.c
===================================================================
--- brlcad/branches/analyze_cmd/src/mged/cmd.c 2020-08-25 14:27:38 UTC (rev
76942)
+++ brlcad/branches/analyze_cmd/src/mged/cmd.c 2020-08-25 14:29:18 UTC (rev
76943)
@@ -267,6 +267,7 @@
solid_list_callback();
update_views = 1;
+ dm_set_dirty(DMP, 1);
return TCL_OK;
}
@@ -338,6 +339,7 @@
return TCL_ERROR;
update_views = 1;
+ dm_set_dirty(DMP, 1);
return TCL_OK;
}
@@ -1750,6 +1752,7 @@
sf = DBIP->dbi_base2local / sf;
update_grids(sf);
update_views = 1;
+ dm_set_dirty(DMP, 1);
return TCL_OK;
}
Modified: brlcad/branches/analyze_cmd/src/mged/edarb.c
===================================================================
--- brlcad/branches/analyze_cmd/src/mged/edarb.c 2020-08-25 14:27:38 UTC
(rev 76942)
+++ brlcad/branches/analyze_cmd/src/mged/edarb.c 2020-08-25 14:29:18 UTC
(rev 76943)
@@ -128,6 +128,7 @@
/* draw the updated solid */
replot_editing_solid();
update_views = 1;
+ dm_set_dirty(DMP, 1);
return TCL_OK;
}
Modified: brlcad/branches/analyze_cmd/src/mged/edsol.c
===================================================================
--- brlcad/branches/analyze_cmd/src/mged/edsol.c 2020-08-25 14:27:38 UTC
(rev 76942)
+++ brlcad/branches/analyze_cmd/src/mged/edsol.c 2020-08-25 14:29:18 UTC
(rev 76943)
@@ -757,6 +757,7 @@
const int local_arb_faces[5][24] = rt_arb_faces;
update_views = 1;
+ dm_set_dirty(DMP, 1);
switch (es_int.idb_type) {
case ID_ARB8:
if (STATE == ST_O_EDIT) {
@@ -6697,6 +6698,7 @@
replot_editing_solid();
if (update_views) {
+ dm_set_dirty(DMP, 1);
struct bu_vls vls = BU_VLS_INIT_ZERO;
bu_vls_printf(&vls, "active_edit_callback");
@@ -9112,6 +9114,7 @@
set_e_axes_pos(1);
update_views = 1;
+ dm_set_dirty(DMP, 1);
/* active edit callback */
bu_vls_printf(&vls, "active_edit_callback");
@@ -9168,6 +9171,7 @@
new_edit_mats();
update_views = 1;
+ dm_set_dirty(DMP, 1);
/* active edit callback */
bu_vls_printf(&vls, "active_edit_callback");
@@ -9198,6 +9202,7 @@
init_oedit_vars();
new_edit_mats();
update_views = 1;
+ dm_set_dirty(DMP, 1);
/* active edit callback */
bu_vls_printf(&vls, "active_edit_callback");
Modified: brlcad/branches/analyze_cmd/src/mged/mater.c
===================================================================
--- brlcad/branches/analyze_cmd/src/mged/mater.c 2020-08-25 14:27:38 UTC
(rev 76942)
+++ brlcad/branches/analyze_cmd/src/mged/mater.c 2020-08-25 14:29:18 UTC
(rev 76943)
@@ -51,6 +51,7 @@
{
dl_color_soltab(GEDP->ged_gdp->gd_headDisplay);
update_views = 1; /* re-write control list with new colors */
+ dm_set_dirty(DMP, 1);
}
Modified: brlcad/branches/analyze_cmd/src/mged/overlay.c
===================================================================
--- brlcad/branches/analyze_cmd/src/mged/overlay.c 2020-08-25 14:27:38 UTC
(rev 76942)
+++ brlcad/branches/analyze_cmd/src/mged/overlay.c 2020-08-25 14:29:18 UTC
(rev 76943)
@@ -57,6 +57,7 @@
return TCL_ERROR;
update_views = 1;
+ dm_set_dirty(DMP, 1);
return ret;
}
@@ -113,6 +114,7 @@
bn_vlblock_free(vbp);
update_views = 1;
+ dm_set_dirty(DMP, 1);
return TCL_OK;
}
@@ -253,6 +255,7 @@
bn_vlblock_free(vbp);
update_views = 1;
+ dm_set_dirty(DMP, 1);
return TCL_OK;
}
Modified: brlcad/branches/analyze_cmd/src/mged/usepen.c
===================================================================
--- brlcad/branches/analyze_cmd/src/mged/usepen.c 2020-08-25 14:27:38 UTC
(rev 76942)
+++ brlcad/branches/analyze_cmd/src/mged/usepen.c 2020-08-25 14:29:18 UTC
(rev 76943)
@@ -83,6 +83,7 @@
}
update_views = 1;
+ dm_set_dirty(DMP, 1);
}
@@ -161,6 +162,7 @@
}
update_views = 1;
+ dm_set_dirty(DMP, 1);
return TCL_OK;
}
@@ -304,6 +306,7 @@
}
update_views = 1;
+ dm_set_dirty(DMP, 1);
return TCL_OK;
}
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
