From 7e9af05a7b770cb804b14a29e13f3be92ed80e48 Mon Sep 17 00:00:00 2001
From: cinnaboot <cinnaboot@protonmail.com>
Date: Mon, 30 Nov 2020 10:38:28 -0500
Subject: [PATCH] move init/shutdown assimp to rendererInit/shutdown

---
 examples/assimp_loading/main.cpp | 2 --
 src/renderer.cpp                 | 4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/examples/assimp_loading/main.cpp b/examples/assimp_loading/main.cpp
index 0c39c4a..ca798ff 100644
--- a/examples/assimp_loading/main.cpp
+++ b/examples/assimp_loading/main.cpp
@@ -62,7 +62,6 @@ main()
 		return 1;
 	}
 
-	meInitAssimp();
 	// TODO: this needs to be more convenient
 	rs->render_groups = renAllocateGroup(1, *rs->default_shader);
 	rs->render_group_count = 1;
@@ -98,7 +97,6 @@ main()
 	}
 
 	renShutdown(rs);
-	meShutdownAssimp();
 	return 0;
 }
 
diff --git a/src/renderer.cpp b/src/renderer.cpp
index 3c9e39d..f9699be 100644
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -47,7 +47,8 @@ renInit(const char* title, glm::vec2 viewport_dims)
 	if (initSDL(rs->handles) &&
 		createWindow(title, rs->handles, rs->viewport_dims) &&
 		initContext(rs->handles) &&
-		initGlOptions())
+		initGlOptions() &&
+		meInitAssimp())
 	{
 		rs->default_shader =
 			shaderInit(DEFAULT_VERTEX_SHADER, DEFAULT_FRAGMENT_SHADER);
@@ -87,6 +88,7 @@ renShutdown(render_state* rs)
 	lightsOut(rs->lights);
 	utilSafeFree(rs->render_groups);
 	utilSafeFree(rs->default_shader);
+	meShutdownAssimp();
 	SDL_GL_DeleteContext(rs->handles.glContext);
 	SDL_DestroyWindow(rs->handles.window);
 	SDL_Quit();