Fixed minor segfaults

ApoorvaJ · Jan 26, 2017 · 083ade4 · 083ade4
1 parent fcf1020
commit 083ade4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/src/ui/common_ui.cpp b/src/ui/common_ui.cpp
@@ -762,7 +762,7 @@ void core::update(PapayaMemory* mem)
                 {
                     GLCHK( glDisable(GL_BLEND) );
 
-                    GLCHK( glBindBuffer(GL_ARRAY_BUFFER, mem->meshes[PapayaMesh_RTTAdd]->vbo_handle) );
+                    GLCHK( glBindBuffer(GL_ARRAY_BUFFER, mem->brush->mesh_RTTAdd->vbo_handle) );
                     GLCHK( glUseProgram(mem->shaders[PapayaShader_ImGui]->id) );
                     GLCHK( glUniformMatrix4fv(mem->shaders[PapayaShader_ImGui]->uniforms[0], 1, GL_FALSE, &mem->cur_doc->proj_mtx[0][0]) );
                     pagl_set_vertex_attribs(mem->shaders[PapayaShader_ImGui]);

diff --git a/src/ui/components/brush.cpp b/src/ui/components/brush.cpp
@@ -30,7 +30,10 @@ Brush* init_brush(PapayaMemory* mem)
 
 void destroy_brush(Brush* b)
 {
-
+    destroy_brush_meshes(b);
+    pagl_destroy_mesh(b->mesh_cursor);
+    pagl_destroy_program(b->pgm_cursor);
+    pagl_destroy_program(b->pgm_stroke);
 }
 
 void resize_brush_meshes(Brush* b, Vec2 size)

diff --git a/src/ui/components/crop_rotate.cpp b/src/ui/components/crop_rotate.cpp
@@ -8,18 +8,19 @@
 #include "ui.h"
 #include "pagl.h"
 #include "gl_lite.h"
+#include "brush.h"
 
 void crop_rotate::init(PapayaMemory* mem)
 {
     // Initialize crop line mesh
-    PaglMesh* m = mem->meshes[PapayaMesh_CropOutline];
-    m = (PaglMesh*) calloc(sizeof(*m), 1);
+    PaglMesh* m = (PaglMesh*) calloc(sizeof(*m), 1);
     m->type = GL_LINE_LOOP;
     m->index_count = 4;
     GLCHK( glGenBuffers(1, &m->vbo_handle) );
     GLCHK( glBindBuffer(GL_ARRAY_BUFFER, m->vbo_handle) );
     GLCHK( glBufferData(GL_ARRAY_BUFFER, sizeof(ImDrawVert) * m->index_count,
                         0, GL_DYNAMIC_DRAW) );
+    mem->meshes[PapayaMesh_CropOutline] = m; // TODO: Own this mesh
 }
 
 void crop_rotate::toolbar(PapayaMemory* mem)
@@ -88,7 +89,7 @@ void crop_rotate::toolbar(PapayaMemory* mem)
         }
 
         // Draw the image onto the frame buffer
-        GLCHK( glBindBuffer(GL_ARRAY_BUFFER, mem->meshes[PapayaMesh_RTTAdd]->vbo_handle) );
+        GLCHK( glBindBuffer(GL_ARRAY_BUFFER, mem->brush->mesh_RTTAdd->vbo_handle) );
         GLCHK( glUseProgram(mem->shaders[PapayaShader_DeMultiplyAlpha]->id) );
         GLCHK( glUniformMatrix4fv(mem->shaders[PapayaShader_ImGui]->uniforms[0],
                                   1, GL_FALSE, (GLfloat*)r) );

diff --git a/src/ui/components/undo.cpp b/src/ui/components/undo.cpp
@@ -6,6 +6,7 @@
 #include "ui.h"
 #include "pagl.h"
 #include "gl_lite.h"
+#include "brush.h"
 
 void undo::init(PapayaMemory* mem)
 {
@@ -31,8 +32,7 @@ void undo::init(PapayaMemory* mem)
         GLCHK( glUniformMatrix4fv(mem->shaders[PapayaShader_ImGui]->uniforms[0],
                                   1, GL_FALSE, &mem->cur_doc->proj_mtx[0][0]) );
 
-        GLCHK( glBindBuffer(GL_ARRAY_BUFFER,
-                            mem->meshes[PapayaMesh_RTTAdd]->vbo_handle) );
+        GLCHK( glBindBuffer(GL_ARRAY_BUFFER, mem->brush->mesh_RTTAdd->vbo_handle) );
         pagl_set_vertex_attribs(mem->shaders[PapayaShader_ImGui]);
 
         // GLCHK( glBindTexture(GL_TEXTURE_2D,

diff --git a/src/ui/ui.h b/src/ui/ui.h
@@ -51,7 +51,6 @@ enum PapayaMesh_ {
     PapayaMesh_ImageSizePreview,
     PapayaMesh_AlphaGrid,
     PapayaMesh_CropOutline,
-    PapayaMesh_RTTAdd,
     PapayaMesh_COUNT
 };