Merge branch 'fix_writing_in_uninitialized_mem' into 'master'

stlgeometry->... functions were not setting global geo, but

See merge request ngsolve/netgen!529
This commit is contained in:
Schöberl, Joachim 2022-09-15 16:51:23 +02:00
commit f91769d53d
3 changed files with 6 additions and 1080 deletions

View File

@ -21,7 +21,6 @@ namespace netgen
/* *********************** Draw STL Geometry **************** */ /* *********************** Draw STL Geometry **************** */
extern STLGeometry * stlgeometry;
DLL_HEADER extern shared_ptr<Mesh> mesh; DLL_HEADER extern shared_ptr<Mesh> mesh;
@ -33,8 +32,6 @@ VisualSceneSTLMeshing :: VisualSceneSTLMeshing ()
{ {
selecttrig = 0; selecttrig = 0;
nodeofseltrig = 1; nodeofseltrig = 1;
stlgeometry->SetSelectTrig(selecttrig);
stlgeometry->SetNodeOfSelTrig(nodeofseltrig);
} }
VisualSceneSTLMeshing :: ~VisualSceneSTLMeshing () VisualSceneSTLMeshing :: ~VisualSceneSTLMeshing ()

View File

@ -35,7 +35,12 @@ namespace netgen
VisualSceneSTLMeshing (); VisualSceneSTLMeshing ();
virtual ~VisualSceneSTLMeshing (); virtual ~VisualSceneSTLMeshing ();
void SetGeometry (class STLGeometry * astlgeometry) { stlgeometry = astlgeometry; } void SetGeometry (class STLGeometry * astlgeometry)
{
stlgeometry = astlgeometry;
stlgeometry->SetSelectTrig(selecttrig);
stlgeometry->SetNodeOfSelTrig(nodeofseltrig);
}
virtual void BuildScene (int zoomall = 0); virtual void BuildScene (int zoomall = 0);
virtual void DrawScene (); virtual void DrawScene ();

File diff suppressed because it is too large Load Diff