[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49129] branches/ge_harmony/source/blender /blenkernel/intern/shader.c: Fixing a logic error in the shader parsing that caused problems with two consecutive new line characters .

[Daniel Stokes]

Revision: 49129
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49129
Author:   kupoman
Date:     2012-07-23 01:54:52 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
Fixing a logic error in the shader parsing that caused problems with two 
consecutive new line characters.

Modified Paths:
--------------
    branches/ge_harmony/source/blender/blenkernel/intern/shader.c

Modified: branches/ge_harmony/source/blender/blenkernel/intern/shader.c
===================================================================
--- branches/ge_harmony/source/blender/blenkernel/intern/shader.c       
2012-07-23 01:00:56 UTC (rev 49128)
+++ branches/ge_harmony/source/blender/blenkernel/intern/shader.c       
2012-07-23 01:54:52 UTC (rev 49129)
@@ -205,13 +205,12 @@
        if (!src)
                return;
 
-       while (*src++ != '\0') {
+       while (*src != '\0') {
                line_len = 0;
                while (*src != '\n' && *src != '\0') {
                        line_len++;
                        src++;
                }
-               line_len++;
                src -= line_len;
                if (starts_with(src, "uniform")) {
                        src += 7;
@@ -230,7 +229,7 @@
                        src++;
                }
                else
-                       src += line_len;
+                       src += line_len+1;
        }
 
 }

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