From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 25 Aug 2012 12:04:23 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/world_cubemaps
X-Git-Tag: xonotic-v0.8.0~5^2~3
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=160ddb2c2a2ffe956770cb7d4128e9424d3b7cc2;hp=a9f168ef698b42f8a93d6d9e5240933727d62e67

Merge branch 'master' into mirceakitsune/world_cubemaps
---

diff --git a/scripts/shader-cpp.sh b/scripts/shader-cpp.sh
index 4d0d4d85..95568f6f 100755
--- a/scripts/shader-cpp.sh
+++ b/scripts/shader-cpp.sh
@@ -174,7 +174,7 @@ conditionalize()
 }
 parse_shader_post()
 {
-	allconds=`echo "$shaderconds" | sort -u | grep .`
+	allconds=`echo "$shaderconds" | sort -u | grep . || true`
 	conds=
 	conditionalize "$allconds"
 }