[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31175] branches/soc-2010-moguri-2/source/ blender/gpu/intern/gpu_codegen.c: Shaders can now be successfully set via KX_PythonShader.

[Mitchell Stokes]

Revision: 31175
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31175
Author:   moguri
Date:     2010-08-08 20:45:09 +0200 (Sun, 08 Aug 2010)

Log Message:
-----------
Shaders can now be successfully set via KX_PythonShader. There was the 
potential to compile an empty geometry shader, which causes errors. I've added 
a guard for all the shaders to make sure empty shaders are no longer being 
compiled (unless Blender generates empty ones).

Modified Paths:
--------------
    branches/soc-2010-moguri-2/source/blender/gpu/intern/gpu_codegen.c

Modified: branches/soc-2010-moguri-2/source/blender/gpu/intern/gpu_codegen.c
===================================================================
--- branches/soc-2010-moguri-2/source/blender/gpu/intern/gpu_codegen.c  
2010-08-08 16:47:58 UTC (rev 31174)
+++ branches/soc-2010-moguri-2/source/blender/gpu/intern/gpu_codegen.c  
2010-08-08 18:45:09 UTC (rev 31175)
@@ -1441,7 +1441,7 @@
        gpu_nodes_get_builtin_flag(nodes, builtins);
 
        /* generate code and compile with opengl */
-       if (frag)
+       if (frag && strcmp(frag, ""))
                fragmentcode = frag;
        else
        {
@@ -1449,12 +1449,12 @@
                libcode = datatoc_gpu_shader_material_glsl;
        }
        
-       if (vert)
+       if (vert && strcmp(vert, ""))
                vertexcode = vert;
        else
                vertexcode = code_generate_vertex(nodes);
 
-       if (geom)
+       if (geom && strcmp(geom, ""))
                geometrycode = geom;
        else
                geometrycode = NULL;


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs