3 files changed, 12 insertions, 4 deletions

diff --git a/src/core/shader_program.h b/src/core/shader_program.h
index 1443663..521118d 100644
--- a/src/core/shader_program.h
+++ b/src/core/shader_program.h
@@ -5,8 +5,6 @@
 
 #include "gl_util.h"
 
-#include <math/fwd.h>
-
 #include <stdbool.h>
 
 typedef struct Texture Texture;
diff --git a/src/llr/llr.c b/src/llr/llr.c
index fe02c0d..25cdf9f 100644
--- a/src/llr/llr.c
+++ b/src/llr/llr.c
@@ -204,7 +204,10 @@ static void configure_state(LLR* renderer) {
   if (renderer->material_changed || renderer->shader_changed) {
     renderer->material_changed = false;
 
-    gfx_material_activate(renderer->shader, renderer->material);
+    // Geometry may be rendered without a material.
+    if (renderer->material) {
+      gfx_material_activate(renderer->shader, renderer->material);
+    }
   }
 
   if (renderer->shader_changed) {
@@ -330,6 +333,13 @@ void gfx_llr_set_camera(LLR* renderer, const Camera* camera) {
   renderer->camera_changed = true;
 }
 
+void gfx_llr_set_projection_matrix(LLR* renderer, const mat4* projection) {
+  assert(renderer);
+
+  renderer->projection     = *projection;
+  renderer->camera_changed = true;
+}
+
 void gfx_llr_set_aspect(LLR* renderer, float aspect) {
   assert(renderer);
 
diff --git a/src/llr/mesh_impl.h b/src/llr/mesh_impl.h
index 96e60df..a997d5b 100644
--- a/src/llr/mesh_impl.h
+++ b/src/llr/mesh_impl.h
@@ -5,5 +5,5 @@
 typedef struct Mesh {
   const Geometry* geometry;
   const Material* material;
-  ShaderProgram*  shader;
+  ShaderProgram*  shader; // TODO: Move this back to Material?
 } Mesh;