Merge branch 'master' into mirceakitsune/world_cubemaps
authorRudolf Polzer <divverent@xonotic.org>
Thu, 5 Apr 2012 16:09:50 +0000 (18:09 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 5 Apr 2012 16:09:50 +0000 (18:09 +0200)
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"
 }