[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11107] branches/soc-2007-maike/source/ blender/src/glutil.c: segfault correction

[Miguel Torres Lima]

Revision: 11107
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11107
Author:   maike
Date:     2007-06-28 19:26:58 +0200 (Thu, 28 Jun 2007)

Log Message:
-----------
segfault correction

Modified Paths:
--------------
    branches/soc-2007-maike/source/blender/src/glutil.c

Modified: branches/soc-2007-maike/source/blender/src/glutil.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glutil.c	2007-06-28 17:25:00 UTC (rev 11106)
+++ branches/soc-2007-maike/source/blender/src/glutil.c	2007-06-28 17:26:58 UTC (rev 11107)
@@ -780,10 +780,6 @@
 {
   Base *base;
   Object *obj;
- 
-  glsl_init_ghash();
-  glsl_init_defmaterial(&defmaterial);
-
   
   for(base= G.scene->base.first; base; base= base->next) {
     if(glsl_active() != 0){
@@ -793,10 +789,16 @@
 	glsl_create_light((Lamp *) obj->data, obj);
       }
     }
-    else
+    else{
       glsl_free_all();
+      return;
+    }
   }
+ 
+  glsl_init_ghash();
   
+  glsl_init_defmaterial(&defmaterial);
+ 
   for(base= G.scene->base.first; base; base= base->next) {
     if(glsl_active()){
       obj = base->object;
@@ -805,7 +807,9 @@
 	glsl_query_material(obj);
       }  
     }
-    else
+    else{
       glsl_free_all();
+      return;
+    }
   }
 }