Merge branch 'master' into mirceakitsune/world_cubemaps
authorMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 25 Aug 2012 12:04:23 +0000 (15:04 +0300)
committerMirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Sat, 25 Aug 2012 12:04:23 +0000 (15:04 +0300)
scripts/shader-cpp.sh

index 4d0d4d8..95568f6 100755 (executable)
@@ -174,7 +174,7 @@ conditionalize()
 }
 parse_shader_post()
 {
-       allconds=`echo "$shaderconds" | sort -u | grep .`
+       allconds=`echo "$shaderconds" | sort -u | grep . || true`
        conds=
        conditionalize "$allconds"
 }