diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-08-24 15:42:00 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-08-24 15:42:00 +0400 |
| commit | 248e3d74a0382dcdf5baf19336ed97e98220fafc (patch) | |
| tree | d2165e8f4fd557c2fdfdca3c8a0c2e1c62127727 /source/blender/freestyle/intern/application/Controller.cpp | |
| parent | af1c274be72b8f42cb15463aebf3b513d1bdb3d4 (diff) | |
Fix for [#36374] Read unitialized memory in Freestyle.
A variable keeping a bounding box was referenced after it was flagged as empty.
Diffstat (limited to 'source/blender/freestyle/intern/application/Controller.cpp')
| -rw-r--r-- | source/blender/freestyle/intern/application/Controller.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp index dbf3fa8349e..c61f72295d2 100644 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -290,6 +290,8 @@ int Controller::LoadMesh(Render *re, SceneRenderLayer *srl) _ListOfModels.push_back("Blender_models"); + _Scene3dBBox = _RootNode->bbox(); + _bboxDiag = (_RootNode->bbox().getMax() - _RootNode->bbox().getMin()).norm(); if (G.debug & G_DEBUG_FREESTYLE) { cout << "Triangles nb : " << _SceneNumFaces << endl; @@ -339,6 +341,7 @@ void Controller::DeleteWingedEdge() // clears the grid _Grid.clear(); + _Scene3dBBox.clear(); _SceneNumFaces = 0; _minEdgeSize = DBL_MAX; } @@ -540,8 +543,8 @@ void Controller::ComputeViewMap() } _Chrono.start(); // Build View Map - _ViewMap = vmBuilder.BuildViewMap(*_winged_edge, _VisibilityAlgo, _EPSILON, _RootNode->bbox(), _SceneNumFaces); - _ViewMap->setScene3dBBox(_RootNode->bbox()); + _ViewMap = vmBuilder.BuildViewMap(*_winged_edge, _VisibilityAlgo, _EPSILON, _Scene3dBBox, _SceneNumFaces); + _ViewMap->setScene3dBBox(_Scene3dBBox); if (G.debug & G_DEBUG_FREESTYLE) { printf("ViewMap edge count : %i\n", _ViewMap->viewedges_size()); |