]> Pileus Git - grits/commitdiff
Fix crash on osx due to uninitialized pointer
authorAndy Spencer <andy753421@gmail.com>
Sun, 30 Dec 2012 06:53:08 +0000 (06:53 +0000)
committerAndy Spencer <andy753421@gmail.com>
Wed, 2 Jan 2013 06:13:45 +0000 (06:13 +0000)
src/roam.c

index 806eb3f64c7d0cadcbbcdbec8608a5862357cd26..e58cd1d6e3bbf34f99d555cbbe87dd3f359ce62d 100644 (file)
@@ -631,6 +631,7 @@ RoamSphere *roam_sphere_new()
        sphere->polys       = 8;
        sphere->triangles   = g_pqueue_new((GCompareDataFunc)tri_cmp, NULL);
        sphere->diamonds    = g_pqueue_new((GCompareDataFunc)dia_cmp, NULL);
        sphere->polys       = 8;
        sphere->triangles   = g_pqueue_new((GCompareDataFunc)tri_cmp, NULL);
        sphere->diamonds    = g_pqueue_new((GCompareDataFunc)dia_cmp, NULL);
+       sphere->view        = g_new0(RoamView, 1);
 
        RoamPoint *vertexes[] = {
                roam_point_new( 90,   0,  0), // 0 (North)
 
        RoamPoint *vertexes[] = {
                roam_point_new( 90,   0,  0), // 0 (North)
@@ -684,8 +685,6 @@ RoamSphere *roam_sphere_new()
  */
 void roam_sphere_update_view(RoamSphere *sphere)
 {
  */
 void roam_sphere_update_view(RoamSphere *sphere)
 {
-       if (!sphere->view)
-               sphere->view = g_new0(RoamView, 1);
        glGetDoublev (GL_MODELVIEW_MATRIX,  sphere->view->model);
        glGetDoublev (GL_PROJECTION_MATRIX, sphere->view->proj);
        glGetIntegerv(GL_VIEWPORT,          sphere->view->view);
        glGetDoublev (GL_MODELVIEW_MATRIX,  sphere->view->model);
        glGetDoublev (GL_PROJECTION_MATRIX, sphere->view->proj);
        glGetIntegerv(GL_VIEWPORT,          sphere->view->view);