Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SceneAlgo : Don't destroy adaptor registry at shutdown #5753

Merged
merged 1 commit into from
Mar 28, 2024
Merged

SceneAlgo : Don't destroy adaptor registry at shutdown #5753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Fixes
-----

- GafferTest, GafferImageTest : Fixed import of these modules if the `Gaffer` module had not been imported previously.
- SceneAlgo : Fixed potential shutdown crashes caused by the adaptor registry.

1.4.0.0b5 (relative to 1.4.0.0b4)
=========
Expand Down
6 changes: 3 additions & 3 deletions src/GafferScene/SceneAlgo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,11 +1331,11 @@ using RenderAdaptors = boost::container::flat_map<string, SceneAlgo::RenderAdapt

RenderAdaptors &renderAdaptors()
{
static RenderAdaptors a;
return a;
static RenderAdaptors *a = new RenderAdaptors;
return *a;
}

}
} // namespace

void GafferScene::SceneAlgo::registerRenderAdaptor( const std::string &name, SceneAlgo::RenderAdaptor adaptor )
{
Expand Down
Loading