[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11663] branches/soc-2007-maike/source/ blender/src: Lamp no diff and no spec both selected bugfix

[Miguel Torres Lima]

Revision: 11663
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11663
Author:   maike
Date:     2007-08-18 19:40:47 +0200 (Sat, 18 Aug 2007)

Log Message:
-----------
Lamp no diff and no spec both selected bugfix

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

Modified: branches/soc-2007-maike/source/blender/src/glsl_material_node.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_material_node.c	2007-08-18 17:27:20 UTC (rev 11662)
+++ branches/soc-2007-maike/source/blender/src/glsl_material_node.c	2007-08-18 17:40:47 UTC (rev 11663)
@@ -244,6 +244,9 @@
   char *specular = NULL;
   char *visibility = NULL;
 
+  if(!diff && !spec && !visibility)
+    return "";
+
   diffuse = glsl_diffuse_func(diff);
   if(!diffuse)
     return NULL;

Modified: branches/soc-2007-maike/source/blender/src/glsl_node_util.c
===================================================================
--- branches/soc-2007-maike/source/blender/src/glsl_node_util.c	2007-08-18 17:27:20 UTC (rev 11662)
+++ branches/soc-2007-maike/source/blender/src/glsl_node_util.c	2007-08-18 17:40:47 UTC (rev 11663)
@@ -276,13 +276,10 @@
 					  GFREE, program_node->node_code);
   }
 
-  light_funcs = glsl_write_light_funcs(diffuse, specular, visibility);
-
-  if(!light_funcs){
+  if(!(light_funcs = glsl_write_light_funcs(diffuse, specular, visibility))){
     MEM_freeN(program_node->uniform_code);
     MEM_freeN(program_node->node_code);
     MEM_freeN(program_node);
-    
     return NULL;
   }
   else if(strcmp(light_funcs, "") != 0) {